Changeset b4d65c7 for src/tests

Timestamp:

Feb 6, 2017, 4:19:53 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

424931d, fe26fbf

Parents:

c0aa336 (diff), 6a5f0e7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src/tests

Files:

• .expect/thread.txt (added)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• dtor-early-exit.c (modified) (1 diff)
• test.py (modified) (2 diffs)
• thread.c (added)
• tupleVariadic.c (modified) (1 diff)

src/tests/Makefile.am

@@ -30 +30 @@
 
 all-local :
-        @+python test.py vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once coroutine
+        @+python test.py vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once coroutine thread
 
 all-tests :

src/tests/Makefile.in

@@ -651 +651 @@
 
 all-local :
-        @+python test.py vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once coroutine
+        @+python test.py vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once coroutine thread
 
 all-tests :

src/tests/dtor-early-exit.c

@@ -28 +28 @@
 // don't want these called
 void ?{}(A * a) { assert( false ); }
-void ?{}(A * a, char * name) { a->name = name; sout | "construct " | name | endl; a->x = malloc(); }
+void ?{}(A * a, char * name) { a->name = name; sout | "construct " | name | endl; a->x = (int*)malloc(); }
 void ?{}(A * a, char * name, int * ptr) { assert( false ); }
 
 A ?=?(A * a, A a) {  sout | "assign " | a->name | " " | a.name; return a; }
-void ?{}(A * a, A a) { sout | "copy construct " | a.name | endl; a->x = malloc(); }
+void ?{}(A * a, A a) { sout | "copy construct " | a.name | endl; a->x = (int*)malloc(); }
 void ^?{}(A * a) { sout | "destruct " | a->name | endl; free(a->x); }
 

src/tests/test.py

@@ -168 +168 @@
 
 def run_test_instance(t, generate, dry_run, debug) :
-        # print formated name
-        name_txt = "%20s  " % t.name
-
-        #run the test instance and collect the result
-        test_failed, error = run_single_test(t, generate, dry_run, debug)
-
-        # update output based on current action
-        if generate :
-                failed_txt = "ERROR"
-                success_txt = "Done"
-        else :
-                failed_txt = "FAILED"
-                success_txt = "PASSED"
-
-        #print result with error if needed
-        text = name_txt + (failed_txt if test_failed else success_txt)
-        out = sys.stdout
-        if error :
-                text = text + "\n" + error
-                out = sys.stderr
-
-        print(text, file = out);
-        sys.stdout.flush()
-        sys.stderr.flush()
-
-        return test_failed
+        try :
+                # print formated name
+                name_txt = "%20s  " % t.name
+
+                #run the test instance and collect the result
+                test_failed, error = run_single_test(t, generate, dry_run, debug)
+
+                # update output based on current action
+                if generate :
+                        failed_txt = "ERROR"
+                        success_txt = "Done"
+                else :
+                        failed_txt = "FAILED"
+                        success_txt = "PASSED"
+
+                #print result with error if needed
+                text = name_txt + (failed_txt if test_failed else success_txt)
+                out = sys.stdout
+                if error :
+                        text = text + "\n" + error
+                        out = sys.stderr
+
+                print(text, file = out);
+                sys.stdout.flush()
+                sys.stderr.flush()
+                return test_failed
+        
+        except KeyboardInterrupt:
+                test_failed = True
+
 
 # run the given list of tests with the given parameters
@@ -209 +213 @@
         pool = Pool(jobs)
         try :
-                results = pool.map_async(partial(run_test_instance, generate=generate, dry_run=dry_run, debug=debug), tests ).get(99999999)
+                results = pool.map_async(partial(run_test_instance, generate=generate, dry_run=dry_run, debug=debug), tests ).get(9999)
         except KeyboardInterrupt:
                 pool.terminate()

src/tests/tupleVariadic.c

@@ -29 +29 @@
 }
 
-forall(otype T, ttype Params | { void ?{}(T *, Params); })
+forall( dtype T, ttype Params | sized(T) | { void ?{}(T *, Params); } )
 T * new(Params p);