Changeset 4bd3069 for tests

Timestamp:

Aug 19, 2018, 10:21:35 AM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

90ed538

Parents:

90cac45 (diff), 72a5a75 (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' into demangler

Location:

tests

Files:

• .expect/forctrl.txt (moved) (moved from src/tests/.expect/forctrl.txt)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• concurrent/examples/boundedBufferEXT.c (modified) (2 diffs)
• concurrent/examples/boundedBufferINT.c (modified) (2 diffs)
• concurrent/examples/quickSort.c (modified) (2 diffs)
• config.py.in (modified) (1 diff)
• coroutine/fibonacci.c (modified) (2 diffs)
• coroutine/fmtLines.c (modified) (3 diffs)
• coroutine/runningTotal.c (modified) (3 diffs)
• fallthrough.c (modified) (2 diffs)
• forctrl.c (moved) (moved from src/tests/forctrl.c) (1 diff)
• labelledExit.c (modified) (6 diffs)
• pybin/settings.py (modified) (5 diffs)
• test.py (modified) (4 diffs)

tests/Makefile.am

@@ -24 +24 @@
 concurrent=
 
-TEST_PY = python ${srcdir}/test.py
+TEST_PY = python ${builddir}/test.py
 
 # applies to both programs

tests/Makefile.in

@@ -301 +301 @@
 quick_test = avl_test operators numericConstants expression enum array typeof cast raii/dtor-early-exit raii/init_once attributes
 concurrent = 
-TEST_PY = python ${srcdir}/test.py
+TEST_PY = python ${builddir}/test.py
 
 # applies to both programs

tests/concurrent/examples/boundedBufferEXT.c

@@ -8 +8 @@
 // Created On       : Wed Apr 18 22:52:12 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May  2 16:12:58 2018
-// Update Count     : 7
+// Last Modified On : Thu Aug 16 08:17:03 2018
+// Update Count     : 8
 //
 
@@ -73 +73 @@
 void main( Consumer & cons ) with( cons ) {
         sum = 0;
-        for ( ;; ) {
+        for () {
                 yield( random( 5 ) );
                 int item = remove( buffer );

tests/concurrent/examples/boundedBufferINT.c

@@ -8 +8 @@
 // Created On       : Mon Oct 30 12:45:13 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Apr 26 23:08:17 2018
-// Update Count     : 82
+// Last Modified On : Thu Aug 16 08:17:58 2018
+// Update Count     : 83
 //
 
@@ -74 +74 @@
 void main( Consumer & cons ) with( cons ) {
         sum = 0;
-        for ( ;; ) {
+        for () {
                 yield( random( 5 ) );
                 int item = remove( buffer );

tests/concurrent/examples/quickSort.c

@@ -9 +9 @@
 // Created On       : Wed Dec  6 12:15:52 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jan 30 15:58:58 2018
-// Update Count     : 162
+// Last Modified On : Thu Aug 16 08:17:41 2018
+// Update Count     : 163
 //
 
@@ -131 +131 @@
 
         if ( &unsortedfile ) {                                                          // generate output ?
-                for ( ;; ) {
+                for () {
                         unsortedfile | size;                                            // read number of elements in the list
                   if ( eof( unsortedfile ) ) break;

tests/config.py.in

@@ -5 +5 @@
 """
 
-SRCDIR   = "@srcdir@"
-BUILDDIR = "@builddir@"
+SRCDIR   = "@abs_srcdir@"
+BUILDDIR = "@abs_builddir@"
 HOSTARCH = "@host_cpu@"

tests/coroutine/fibonacci.c

@@ -11 +11 @@
 // Created On       : Thu Jun  8 07:29:37 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Apr 27 08:55:31 2018
-// Update Count     : 19
+// Last Modified On : Thu Aug 16 08:18:16 2018
+// Update Count     : 20
 //
 
@@ -26 +26 @@
         fn = 1;  fn2 = fn1;  fn1 = fn;                                          // 2nd case
         suspend();                                                                                      // restart last resume
-        for ( ;; ) {
+        for () {
                 fn = fn1 + fn2;  fn2 = fn1;  fn1 = fn;                  // general case
                 suspend();                                                                              // restart last resume

tests/coroutine/fmtLines.c

@@ -10 +10 @@
 // Created On       : Sun Sep 17 21:56:15 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 15 12:25:33 2018
-// Update Count     : 42
+// Last Modified On : Thu Aug 16 08:20:54 2018
+// Update Count     : 45
 //
 
@@ -23 +23 @@
 
 void main( Format & fmt ) with( fmt ) {
-        for ( ;; ) {                                                                            // for as many characters
-                for ( g = 0; g < 5; g += 1 ) {                                  // groups of 5 blocks
-                        for ( b = 0; b < 4; b += 1 ) {                          // blocks of 4 characters
-                                for ( ;; ) {                                                    // for newline characters
+        for () {                                                                                        // for as many characters
+                for ( g; 5 ) {                                                                  // groups of 5 blocks
+                        for ( b; 4 ) {                                                          // blocks of 4 characters
+                                for () {                                                                // for newline characters
                                         suspend();
                                         if ( ch != '\n' ) break;                        // ignore newline
@@ -53 +53 @@
         Format fmt;
 
-        eof: for ( ;; ) {                                                                       // read until end of file
+  eof: for () {                                                                                 // read until end of file
                 sin | fmt.ch;                                                                   // read one character
           if ( eof( sin ) ) break eof;                                          // eof ?

tests/coroutine/runningTotal.c

@@ -10 +10 @@
 // Created On       : Wed Dec  6 08:05:27 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec  6 08:09:24 2017
-// Update Count     : 2
+// Last Modified On : Thu Aug 16 08:22:29 2018
+// Update Count     : 3
 //
 
@@ -29 +29 @@
 
 void main( RunTotal & rntl ) with( rntl ) {
-        for ( ;; ) {
+        for () {
                 update( rntl, input );
         } // for
@@ -41 +41 @@
 int main() {
         RunTotal rntl;
-        for ( int i = 0; i < 10; i += 1 ) {
+        for ( i; 10 ) {
                 sout | i | add( rntl, i ) | endl;
         } // for

tests/fallthrough.c

@@ -10 +10 @@
 // Created On       : Wed Mar 14 10:06:25 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 14 22:45:13 2018
-// Update Count     : 13
+// Last Modified On : Thu Aug 16 08:21:46 2018
+// Update Count     : 14
 //
 
@@ -92 +92 @@
         choose ( 3 ) {
                 case 2:
-                        for ( ;; ) {
+                        for () {
                                 choose ( 2 ) {
                                         case 1:

tests/forctrl.c

@@ -10 +10 @@
 // Created On       : Wed Aug  8 18:32:59 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  9 07:50:48 2018
-// Update Count     : 5
+// Last Modified On : Thu Aug 16 09:25:47 2018
+// Update Count     : 6
 // 
 
-#include <fstream>
+#include <fstream.hfa>
 
 struct S { int i, j; };

tests/labelledExit.c

@@ -10 +10 @@
 // Created On       : Wed Aug 10 07:29:39 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 10 07:30:15 2016
-// Update Count     : 1
+// Last Modified On : Thu Aug 16 08:55:39 2018
+// Update Count     : 3
 // 
 
@@ -60 +60 @@
         }
 
-  D: for ( ;; ) {
+  D: for () {
                 break D;
                 continue D;
@@ -67 +67 @@
   Z : i += 1;
         goto Z;
-  X: Y: for ( ;; ) {
+  X: Y: for () {
                 i += 1;
                 if ( i > 5 ) continue X;
@@ -74 +74 @@
                 break;
         }
-  XX: for ( ;; ) {
-          YY: for ( ;; ) {
-                  ZZ: for ( ;; ) {
+  XX: for () {
+          YY: for () {
+                  ZZ: for () {
                                 i += 1;
                                 if ( i > 5 ) continue XX;
@@ -89 +89 @@
         }
 
-        for ( ;; ) ;
+        for () ;
         for ( int i = 0 ;; ) ;
         for (  ; i < 0; ) ;
@@ -97 +97 @@
   L20: L21: L22: L23: L24: L25: L26: L27: L28: L29:
   L31: L32: L33: L34:
-        for ( ;; ) {
+        for () {
                 break L0;
         }

tests/pybin/settings.py

@@ -6 +6 @@
 
 try :
-        sys.path.append(os.getcwd())
+        testpath = os.path.dirname(os.path.abspath(os.path.join(os.getcwd(), sys.argv[0])))
+        sys.path.append(testpath)
         import config
 
         SRCDIR = os.path.abspath(config.SRCDIR)
         BUILDDIR = os.path.abspath(config.BUILDDIR)
+        os.chdir(testpath)
+
 except:
         print('ERROR: missing config.py, re-run configure script.', file=sys.stderr)
@@ -88 +91 @@
                 self.flags  = """INSTALL_FLAGS="%s" """ % ("" if value else "-in-tree")
 
+class Timeouts:
+        def __init__(self, ts, tg):
+                self.single = Timeouts.check(ts)
+                self.total  = Timeouts.check(tg)
+
+        @classmethod
+        def check(_, value):
+                if value < 1:
+                        print("Timeouts must be at least 1 second", file=sys.stderr)
+                        sys.exit(1)
+
+                return value
+
 def init( options ):
         global arch
@@ -95 +111 @@
         global debug
         global install
+        global timeout
 
         dry_run    = options.dry_run
@@ -102 +119 @@
         install    = Install(options.install)
         arch       = Architecture(options.arch)
+        timeout    = Timeouts(options.timeout, options.global_timeout)
 
 
@@ -110 +128 @@
 
 def validate():
-        make_ret, _ = tools.make( ".validate", error_file = ".validate.err", redirects  = "2> /dev/null 1> /dev/null", )
+        errf = os.path.join(BUILDDIR, ".validate.err")
+        make_ret, _ = tools.make( ".validate", error_file = errf, redirects  = "2> /dev/null 1> /dev/null", )
         if make_ret != 0:
-                with open (".validate.err", "r") as myfile:
+                with open (errf, "r") as myfile:
                         error=myfile.read()
                 print("ERROR: Invalid configuration %s:%s" % (arch.string, debug.string), file=sys.stderr)
                 print("       verify returned : \n%s" % error, file=sys.stderr)
-                tools.rm("%s/.validate.err" % BUILDDIR)
+                tools.rm(errf)
                 sys.exit(1)
 
-        tools.rm("%s/.validate.err" % BUILDDIR)
+        tools.rm(errf)

tests/test.py

@@ -88 +88 @@
         parser.add_argument('--install', help='Run all tests based on installed binaries or tree binaries', type=yes_no, default='no')
         parser.add_argument('--arch', help='Test for specific architecture', type=str, default='')
+        parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=60)
+        parser.add_argument('--global-timeout', help='Maximum cumulative duration in seconds after the ALL tests are considered to have timed out', type=int, default=7200)
         parser.add_argument('--dry-run', help='Don\'t run the tests, only output the commands', action='store_true')
         parser.add_argument('--list', help='List all test available', action='store_true')
@@ -160 +162 @@
                 if settings.dry_run or fileIsExecutable(exe_file) :
                         # run test
-                        retcode, _ = sh("timeout 60 %s > %s 2>&1" % (exe_file, out_file), input = in_file)
+                        retcode, _ = sh("timeout %d %s > %s 2>&1" % (settings.timeout.single, exe_file, out_file), input = in_file)
                 else :
                         # simply cat the result into the output
@@ -234 +236 @@
                         tests,
                         chunksize = 1
-                ).get(7200)
+                ).get(settings.timeout.total)
         except KeyboardInterrupt:
                 pool.terminate()
@@ -283 +285 @@
         # users may want to simply list the tests
         if options.list_comp :
-                print("-h --help --debug --dry-run --list --arch --all --regenerate-expected -j --jobs ", end='')
+                print("-h --help --debug --dry-run --list --arch --all --regenerate-expected --install --timeout --global-timeout -j --jobs ", end='')
                 print(" ".join(map(lambda t: "%s" % (t.target()), tests)))