Tidied up the build, install, and regression tests.

[fw/sdcc] / support / regression / generate-cases.py

diff --git a/support/regression/generate-cases.py b/support/regression/generate-cases.py
index 350e80887a9e2c7c0865794d0379d52ff2ce3b32..917213d6d0589f02d0391ba97b6d7418103e07de 100644 (file)
--- a/support/regression/generate-cases.py
+++ b/support/regression/generate-cases.py
@@ -1,13 +1,15 @@
 from HTMLgen import TemplateDocument
 import sys, re, tempfile, os
 
+"""See InstanceGenerator for a description of this file"""
+
 # Globals
 # Directory that the generated files should be placed into
-outdir = 'cases'
+outdir = sys.argv[2]
 
 # Start of the test function table definition
 testfuntableheader = """
-static void (*const _tests[])(void) = {
+static TESTFUNP _tests[] = {
 """
 
 
@@ -18,10 +20,10 @@ testfuntablefooter = """\tNULL
 
 # Code to generate the suite function
 testfunsuite = """
-void **
+TESTFUNP *
 suite(void)
 {
-    return (void **)_tests;
+    return _tests;
 }
 
 const char *
@@ -169,17 +171,22 @@ class InstanceGenerator:
         createdir(outdir)
 
         # Generate
-        self.permute(os.path.join(outdir, self.basename), self.replacements.keys())
+        self.permute(os.path.join(outdir, os.path.basename(self.basename)), self.replacements.keys())
 
         # Remove the temporary file
         os.remove(self.tmpname)
 
-# Check and parse the command line arguments
-if len(sys.argv) < 2:
-    # PENDING: How to throw an error?
-    print "usage: generate-cases.py template.c"
+def main():
+    # Check and parse the command line arguments
+    if len(sys.argv) < 3:
+        print "usage: generate-cases.py template.c outdir"
+        sys.exit(-1)
+        
+    # Input name is the first arg.
 
-# Input name is the first arg.
+    s = InstanceGenerator(sys.argv[1])
+    s.generate()
 
-s = InstanceGenerator(sys.argv[1])
-s.generate()
+if __name__ == '__main__':
+    main()
+