Changeset 74ec742 for tests

Timestamp:

May 20, 2022, 10:36:45 AM (4 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

25fa20a

Parents:

29d8c02 (diff), 7831e8fb (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests

Files:

• .expect/forall.txt (modified) (1 diff)
• .expect/loop_else.txt (added)
• .expect/nested-types-ERR2.nast.txt (added)
• .expect/nested-types-ERR2.oast.txt (moved) (moved from tests/.expect/nested-types-ERR2.txt )
• forall.cfa (modified) (4 diffs)
• include/.expect/includes.nast.txt (modified) (1 diff)
• include/includes.cfa (modified) (7 diffs)
• loop_else.cfa (added)
• pybin/settings.py (modified) (1 diff)
• pybin/test_run.py (modified) (1 diff)
• test.py (modified) (2 diffs)
• unified_locking/.expect/fast_block_lock.txt (added)
• unified_locking/.expect/locks.txt (modified) (1 diff)
• unified_locking/fast_block_lock.cfa (added)
• unified_locking/locks.cfa (modified) (3 diffs)

tests/.expect/forall.txt

@@ -1 @@
-forall.cfa:242:25: warning: Compiled
+forall.cfa:244:25: warning: Compiled

tests/forall.cfa

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// forall.cfa -- 
-// 
+//
+// forall.cfa --
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed May  9 08:48:15 2018
@@ -12 +12 @@
 // Last Modified On : Sat Jun  5 10:06:08 2021
 // Update Count     : 36
-// 
+//
 
 void g1() {
@@ -45 +45 @@
 }
 
-typedef forall ( T ) int (* f)( int );
+// commented this out since it is not clearly meaningful
+// and not really representable in the ast
+// typedef forall ( T ) int (* f)( int );
 
 forall( T )
@@ -170 +172 @@
 }
 
-forall( T | { T ?+?( T, T ); } ) forall( S | { T ?+?( T, S ); } ) 
+forall( T | { T ?+?( T, T ); } ) forall( S | { T ?+?( T, S ); } )
 struct XW { T t; };
 XW(int,int) xww;

tests/include/.expect/includes.nast.txt

@@ -1 @@
-include/includes.cfa:153:25: warning: Compiled
+include/includes.cfa:169:25: warning: Compiled

tests/include/includes.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  3 22:06:07 2022
-// Update Count     : 774
+// Last Modified On : Tue May 10 16:36:44 2022
+// Update Count     : 776
 //
 
@@ -32 +32 @@
 #include <crypt.h>
 #include <ctype.h>
-//#include <curses.h>                                                                           // may not be installed
+#if __has_include( "curses.h" )
+#include <curses.h>                                                                             // may not be installed
+#endif
 #include <dirent.h>
 #include <dlfcn.h>
@@ -41 +43 @@
 #include <errno.h>
 #include <error.h>
-//#include <eti.h>                                                                              // may not be installed, comes with ncurses
+#if __has_include( "eti.h" )
+#include <eti.h>                                                                                // may not be installed, comes with ncurses
+#endif
 #include <execinfo.h>
 #include <expat.h>
@@ -50 +54 @@
 #include <fmtmsg.h>
 #include <fnmatch.h>
-//#include <form.h>                                                                             // may not be installed, comes with ncurses
+#if __has_include( "form.h" )
+#include <form.h>                                                                               // may not be installed, comes with ncurses
+#endif
 #include <fstab.h>
 #include <fts.h>
@@ -78 +84 @@
 #include <mcheck.h>
 #include <memory.h>
-//#include <menu.h>                                                                             // may not be installed, comes with ncurses
+#if __has_include( "menu.h" )
+#include <menu.h>                                                                               // may not be installed, comes with ncurses
+#endif
 #include <mntent.h>
 #include <monetary.h>
 #include <mqueue.h>
-//#include <ncurses_dll.h>                                                              // may not be installed, comes with ncurses
+#if __has_include( "ncurses_dll.h" )
+#include <ncurses_dll.h>                                                                // may not be installed, comes with ncurses
+#endif
 #include <netdb.h>
 #include <nl_types.h>
 #include <nss.h>
 #include <obstack.h>
-//#include <panel.h>                                                                            // may not be installed, comes with ncurses
+#if __has_include( "panel.h" )
+#include <panel.h>                                                                              // may not be installed, comes with ncurses
+#endif
 #include <paths.h>
 #include <poll.h>
@@ -118 +130 @@
 #include <syslog.h>
 #include <tar.h>
-//#include <term.h>                                                                             // may not be installed, comes with ncurses
-//#include <termcap.h>                                                                  // may not be installed, comes with ncurses
+#if __has_include( "term.h" )
+#include <term.h>                                                                               // may not be installed, comes with ncurses
+#include <termcap.h>                                                                    // may not be installed, comes with ncurses
+#endif
 #include <termio.h>
 #include <termios.h>
@@ -131 +145 @@
 #include <ucontext.h>
 #include <ulimit.h>
-//#include <unctrl.h>                                                                           // may not be installed, comes with ncurses
+#if __has_include( "unctrl.h" )
+#include <unctrl.h>                                                                             // may not be installed, comes with ncurses
+#endif
 #include <unistd.h>
 #include <utime.h>

tests/pybin/settings.py

@@ -201 +201 @@
         global output_width
         output_width = max(map(lambda t: len(t.target()), tests))
+        # 35 is the maximum width of the name field before we get line wrapping.
+        output_width = min(output_width, 35)

tests/pybin/test_run.py

@@ -43 +43 @@
                 return os.path.normpath( os.path.join(settings.BUILDDIR, self.path, self.name) )
 
+        def format_target(self, width):
+                target = self.target()
+                length = len(target)
+                if length < width:
+                        return '{0:{width}}'.format(target, width=width)
+                elif length == width:
+                        return target
+                else:
+                        return '...' + target[3-width:]
+
         @staticmethod
         def valid_name(name):

tests/test.py

@@ -132 +132 @@
         parser.add_argument('--install', help='Run all tests based on installed binaries or tree binaries', type=comma_separated(yes_no), default='no')
         parser.add_argument('--continue', help='When multiple specifications are passed (debug/install/arch), sets whether or not to continue if the last specification failed', type=yes_no, default='yes', dest='continue_')
-        parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=120)
+        parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=180)
         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('--timeout-with-gdb', help='Instead of killing the command when it times out, orphan it and print process id to allow gdb to attach', type=yes_no, default="no")
@@ -252 +252 @@
         try :
                 # print formated name
-                name_txt = '{0:{width}}  '.format(t.target(), width=settings.output_width)
+                name_txt = t.format_target(width=settings.output_width) + '  '
 
                 retcode, error, duration = run_single_test(t)

tests/unified_locking/.expect/locks.txt

@@ -23 +23 @@
 Start Test 12: locked condition variable wait/notify with front()
 Done Test 12
+Start Test 13: fast block lock and fast cond var single wait/notify
+Done Test 13

tests/unified_locking/locks.cfa

@@ -18 +18 @@
 condition_variable( linear_backoff_then_block_lock ) c_l;
 
+fast_block_lock f;
+fast_cond_var( fast_block_lock ) f_c_f;
+
 thread T_C_M_WS1 {};
 
@@ -99 +102 @@
                 }
                 unlock(l);
+        }
+}
+
+thread T_F_C_F_WS1 {};
+
+void main( T_F_C_F_WS1 & this ) {
+        for (unsigned int i = 0; i < num_times; i++) {
+                lock(f);
+                if(empty(f_c_f) && i != num_times - 1) {
+                        wait(f_c_f,f);
+                }else{
+                        notify_one(f_c_f);
+                        unlock(f);
+                }
         }
 }
@@ -322 +339 @@
         }
         printf("Done Test 12\n");
-}
+
+        printf("Start Test 13: fast block lock and fast cond var single wait/notify\n");
+        {
+                T_F_C_F_WS1 t1[2];
+        }
+        printf("Done Test 13\n");
+        
+}