Changeset 9139540 for tests

Timestamp:

Nov 12, 2020, 11:04:23 PM (13 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

arm-eh, jacob/cs343-translation, master, new-ast-unique-expr

Children:

726b748

Parents:

10d609a (diff), 57ccff1 (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/KRfunctions.arm64.txt (added)
• .expect/attributes.arm64.txt (added)
• .expect/bitmanip1.arm64.txt (added)
• .expect/bitmanip2.arm64.txt (added)
• .expect/bitmanip3.arm64.txt (added)
• .expect/declarationSpecifier.arm64.txt (added)
• .expect/extension.arm64.txt (added)
• .expect/functions.arm64.txt (added)
• .expect/gccExtensions.arm64.txt (added)
• .expect/manipulatorsInput.arm64.txt (added)
• .expect/manipulatorsOutput3.arm64.txt (added)
• .expect/math4.arm64.txt (added)
• errors/.expect/completeType.arm64.txt (added)
• generator/suspend_then.cfa (modified) (1 diff)
• pybin/tools.py (modified) (1 diff)
• references.cfa (modified) (1 diff)
• test.py (modified) (1 diff)
• tuple/tupleAssign.cfa (modified) (2 diffs)

tests/generator/suspend_then.cfa

@@ -40 +40 @@
         Fibonacci f1, f2;
         for ( 10 ) {                                                            // print N Fibonacci values
-                sout | next( f1 ) | next( f2 );
+                int v1 = next( f1 );
+                int v2 = next( f2 );
+                sout | v1 | v2;
         } // for
 }

tests/pybin/tools.py

@@ -73 +73 @@
                                         )
 
-                                        return proc.returncode, out.decode("utf-8") if out else None
+                                        return proc.returncode, out.decode("latin-1") if out else None
                                 except subprocess.TimeoutExpired:
                                         if settings.timeout2gdb:

tests/references.cfa

@@ -124 +124 @@
                 int *p = &a;
                 asm (
-                        "incl %[p]\n\t"
-                        : [p] "+m" (*p)
+                        #if defined( __i386 ) || defined( __x86_64 )
+                                "incl %[p]\n\t"
+                                : [p] "+m" (*p)
+                        #elif defined( __aarch64__ )
+                                "ldr     w1, %[p]\n\t"
+                                "add     w1, w1, 1\n\t"
+                                "str     w1, %[p]\n\t"
+                                : [p] "+m" (*p) ::"w1"
+                        #endif
                 );
                 printf("%d\n", a);

tests/test.py

@@ -99 +99 @@
 
                                         # print a warning if it users didn't ask for a specific architecture
-                                        if not options.arch:
+                                        found_arch = [f.arch for f in found if f.arch]
+                                        if found_arch and not options.arch:
                                                 print('WARNING: "%s", test has architecture specific expected files but --arch was not specified, regenerating only for current host' % testname, file=sys.stderr)
 
 
                                         # print a warning if it users didn't ask for a specific ast version
-                                        if not options.ast:
+                                        found_astv = [f.astv for f in found if f.astv]
+                                        if found_astv and not options.ast:
                                                 print('WARNING: "%s", test has ast version specific expected files but --ast was not specified, regenerating only for current ast' % testname, file=sys.stderr)
 

tests/tuple/tupleAssign.cfa

@@ -44 +44 @@
                 double d = 0.0;
                 int i = 0;
-                char c = '\0';
+                signed char c = '\0';
                 struct X {
                         int z;
@@ -55 +55 @@
                 [t, x, d, i, c, x] = (double)94.12;
                 printf( "d=%lg i=%d c=%c t=[%d, %lg, %d]\n", d, i, (int)c, t );
-                sout | "d=" | d | "i=" | i | "c=" | c | ' ' | "t=[" | t | "]";
+                sout | "d=" | d | "i=" | i | "c=" | (char)c | ' ' | "t=[" | t | "]";
                 [x, c, i, d, x, t] = (double)-94.12;
                 printf( "d=%lg i=%d c=%c t=[%d, %lg, %d]\n", d, i, c, t );
-                sout | "d=" | d | "i=" | i | "c=" | c | ' ' | "t=[" | t | "]";
+                sout | "d=" | d | "i=" | i | "c=" | (char)c | ' ' | "t=[" | t | "]";
         }
 }