Changeset cc7bbe6 for tests

Timestamp:

Feb 23, 2022, 11:24:34 AM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

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

Children:

08ed947

Parents:

f5a51db (diff), 3a038fa (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/PRNG.txt (added)
• .expect/declarationSpecifier.arm64.txt (modified) (2 diffs)
• .expect/gccExtensions.arm64.txt (modified) (2 diffs)
• .expect/random.arm64.txt (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• PRNG.cfa (added)
• meta/dumpable.cfa (modified) (1 diff)
• unified_locking/mutex_test.hfa (modified) (1 diff)

tests/.expect/declarationSpecifier.arm64.txt

@@ -1132 +1132 @@
 char **_X13cfa_args_argvPPc_1;
 char **_X13cfa_args_envpPPc_1;
-signed int _X17cfa_main_returnedi_1 = ((signed int )0);
+__attribute__ ((weak)) extern signed int _X17cfa_main_returnedi_1;
 signed int main(signed int _X4argci_1, char **_X4argvPPc_1, char **_X4envpPPc_1){
     __attribute__ ((unused)) signed int _X12_retval_maini_1;
@@ -1149 +1149 @@
     signed int _tmp_cp_ret6;
     signed int _X3reti_2 = (((void)(_tmp_cp_ret6=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret6);
-    {
-        ((void)(_X17cfa_main_returnedi_1=((signed int )1)));
+    if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
+        {
+            ((void)(_X17cfa_main_returnedi_1=((signed int )1)));
+        }
+
     }
 

tests/.expect/gccExtensions.arm64.txt

@@ -324 +324 @@
 char **_X13cfa_args_argvPPc_1;
 char **_X13cfa_args_envpPPc_1;
-signed int _X17cfa_main_returnedi_1 = ((signed int )0);
+__attribute__ ((weak)) extern signed int _X17cfa_main_returnedi_1;
 signed int main(signed int _X4argci_1, char **_X4argvPPc_1, char **_X4envpPPc_1){
     __attribute__ ((unused)) signed int _X12_retval_maini_1;
@@ -341 +341 @@
     signed int _tmp_cp_ret6;
     signed int _X3reti_2 = (((void)(_tmp_cp_ret6=invoke_main(_X4argci_1, _X4argvPPc_1, _X4envpPPc_1))) , _tmp_cp_ret6);
-    {
-        ((void)(_X17cfa_main_returnedi_1=((signed int )1)));
+    if ( ((&_X17cfa_main_returnedi_1)!=((signed int *)0)) ) {
+        {
+            ((void)(_X17cfa_main_returnedi_1=((signed int )1)));
+        }
+
     }
 

tests/.expect/random.arm64.txt

@@ -1 +1 @@
 õ
 =
-V
+K
 -911259971
 6
--4
+11
 1232105397
 0
-18
+11
 -914096085
 1
-15
+20
 2077092859
 1
-11
+12
 0.677254
 0.678106775246139

tests/Makefile.am

@@ -43 +43 @@
         -g \
         -Wall \
+        -Werror=return-type \
         -Wno-unused-function \
         -Wno-psabi \

tests/meta/dumpable.cfa

@@ -72 +72 @@
         }
 
-        if((buf.f_bsize * buf.f_bavail) < 536870912) {
-                serr | "Available diskspace is less than ~500Mb: " | (buf.f_bsize * buf.f_bavail);
+        uint64_t avail = buf.f_bavail;
+        avail *= buf.f_bsize;
+        if(avail < 536870912_l64u) {
+                serr | "Available diskspace is less than ~500Mb: " | avail;
         }
 

tests/unified_locking/mutex_test.hfa

@@ -54 +54 @@
 }
 
-int test() {
+void test() {
         uint32_t sum = -32;
         mo.sum = -32;