Changeset 90a8125 for tests

Timestamp:

Jun 3, 2022, 3:10:01 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

7affcda

Parents:

bf0263c (diff), fc134a48 (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/attributes.nast.x64.txt (modified) (1 diff)
• .expect/attributes.nast.x86.txt (modified) (1 diff)
• .expect/attributes.oast.x64.txt (modified) (1 diff)
• .expect/attributes.oast.x86.txt (modified) (1 diff)
• .expect/nested_function.txt (added)
• .expect/quasiKeyword.txt (modified) (1 diff)
• concurrent/examples/multiSort.cfa (added)
• enum_tests/.expect/structEnum.txt (added)
• enum_tests/structEnum.cfa (added)
• exceptions/defaults.cfa (modified) (2 diffs)
• include/.expect/includes.nast.txt (modified) (1 diff)
• include/includes.cfa (modified) (7 diffs)
• linking/exception-nothreads.cfa (modified) (1 diff)
• linking/exception-withthreads.cfa (modified) (1 diff)
• nested_function.cfa (added)
• pybin/settings.py (modified) (1 diff)
• pybin/test_run.py (modified) (1 diff)
• quasiKeyword.cfa (modified) (3 diffs)
• test.py (modified) (2 diffs)

tests/.expect/attributes.nast.x64.txt

@@ -1339 +1339 @@
         }
 
-        {
-            ((void)(_X4_retM12__anonymous4_2=(*_X4_dstM12__anonymous4_2)) /* ?{} */);
-        }
-
-        return _X4_retM12__anonymous4_2;
+        return (*_X4_dstM12__anonymous4_2);
     }
     {

tests/.expect/attributes.nast.x86.txt

@@ -1339 +1339 @@
         }
 
-        {
-            ((void)(_X4_retM12__anonymous4_2=(*_X4_dstM12__anonymous4_2)) /* ?{} */);
-        }
-
-        return _X4_retM12__anonymous4_2;
+        return (*_X4_dstM12__anonymous4_2);
     }
     {

tests/.expect/attributes.oast.x64.txt

@@ -1339 +1339 @@
         }
 
-        {
-            ((void)(_X4_retM12__anonymous4_2=(*_X4_dstM12__anonymous4_2)) /* ?{} */);
-        }
-
-        return _X4_retM12__anonymous4_2;
+        return (*_X4_dstM12__anonymous4_2);
     }
     {

tests/.expect/attributes.oast.x86.txt

@@ -1339 +1339 @@
         }
 
-        {
-            ((void)(_X4_retM12__anonymous4_2=(*_X4_dstM12__anonymous4_2)) /* ?{} */);
-        }
-
         return _X4_retM12__anonymous4_2;
     }

tests/.expect/quasiKeyword.txt

@@ -1 @@
-quasiKeyword.cfa:54:25: warning: Compiled
+quasiKeyword.cfa:52:25: warning: Compiled

tests/exceptions/defaults.cfa

@@ -2 +2 @@
 
 #include <string.h>
-#include <exception.hfa>
 
 exception log_message {
@@ -8 +7 @@
 };
 
-_EHM_DEFINE_COPY(log_message, )
+// Manually define the virtual table and helper functions.
+void copy(log_message * this, log_message * that) {
+        *this = *that;
+}
+
 const char * msg(log_message * this) {
         return this->msg;
 }
-_EHM_VIRTUAL_TABLE(log_message, , log_vt);
+
+const struct log_message_vtable log_vt @= {
+        .__cfavir_typeid : &__cfatid_log_message,
+        .size : sizeof(struct log_message),
+        .copy : copy,
+        .^?{} : ^?{},
+        .msg : msg,
+};
 
 // Logging messages don't have to be handled.

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

@@ -1 @@
-include/includes.cfa:153:25: warning: Compiled
+include/includes.cfa:173: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 : Sun May 22 08:27:20 2022
+// Update Count     : 779
 //
 
@@ -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>
+#if __has_include( "expat.h" )
+#include <expat.h>                                                                              // may not be installed
 #include <expat_external.h>
+#endif
 #include <fcntl.h>
 #include <features.h>
@@ -50 +56 @@
 #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>
@@ -73 +81 @@
 //#include <link.h>                                                                             // CFA bug #240 nested anonymous enum fails
 #include <locale.h>
-#include <ltdl.h>
+#if __has_include( "ltdl.h" )
+#include <ltdl.h>                                                                               // may not be installed
+#endif
 //#include <malloc.h>                                                                   // cannot include in extern "C" because of CFA #include_next
 #include <math.h>
 #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 +134 @@
 #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 +149 @@
 #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/linking/exception-nothreads.cfa

@@ -15 +15 @@
 
 #include <stdlib.hfa>
-#include <exception.hfa>
 
-EHM_EXCEPTION(ping)();
-EHM_VIRTUAL_TABLE(ping, ping_vt);
+exception ping {};
+vtable(ping) ping_vt;
 
 int main(void) {

tests/linking/exception-withthreads.cfa

@@ -15 +15 @@
 
 #include <stdlib.hfa>
-#include <exception.hfa>
 #include "../exceptions/with-threads.hfa"
 
-EHM_EXCEPTION(ping)();
-EHM_VIRTUAL_TABLE(ping, ping_vt);
+exception ping {};
+vtable(ping) ping_vt;
 
 int main(void) {

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/quasiKeyword.cfa

@@ -4 +4 @@
 // quasiKeyword.cfa -- test that quasi-keywords can be used for variable and functions names, as well as keywords in
 //                                         control structures.
-// 
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed Feb 17 10:33:49 2021
@@ -10 +10 @@
 // Last Modified On : Sat Jun  5 10:07:59 2021
 // Update Count     : 8
-// 
+//
 
-#include <exception.hfa>
-
-EHM_EXCEPTION( E )();
+exception E {};
 
 void catch( int i ) {}
@@ -49 +47 @@
                 } fixup ( E * ) {
                 } finally {
-                } 
+                }
         else catch = 3;
 

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)