Changeset 2724b4e for tests

Timestamp:

Sep 16, 2020, 1:48:17 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

673eb7a

Parents:

c402739f (diff), da9a27c (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:

• Makefile.am (modified) (3 diffs)
• concurrent/.expect/join.txt (added)
• concurrent/.expect/joinerror.sed (moved) (moved from tests/.expect/smart-pointers.txt)
• concurrent/join.cfa (added)
• concurrent/joinerror.cfa (added)
• linking/.expect/linkerror.txt (added)
• linking/linkerror.cfa (added)
• pybin/tools.py (modified) (1 diff)
• test.py (modified) (1 diff)

tests/Makefile.am

@@ -38 +38 @@
 # since automake doesn't have support for CFA we have to
 AM_CFLAGS = $(if $(test), 2> $(test), ) \
+        -fdebug-prefix-map=$(abspath ${abs_srcdir})= \
+        -fdebug-prefix-map=/tmp= \
         -g \
         -Wall \
@@ -110 +112 @@
 % : %.cfa $(CFACCBIN)
         $(CFACOMPILETEST) -c -o $(abspath ${@}).o
-        $(CFACCLOCAL) $($(shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g')) $(abspath ${@}).o -o $(abspath ${@})
+        $(CFACCLOCAL) $(if $(test), 2> $(test), ) $($(shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g')) ${@}.o -o $(abspath ${@})
 
 # implicit rule for c++ test
@@ -137 +139 @@
 # CUSTOM TARGET
 #------------------------------------------------------------------------------
+# tests that just validate syntax
+expression : expression.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -c -fsyntax-only 2> $(abspath ${@})
+
 # expected failures
 # use custom target since they require a custom define and custom dependencies

tests/pybin/tools.py

@@ -120 +120 @@
                 return None
 
-        file = open(file, mode)
+        file = open(file, mode, encoding="latin-1") # use latin-1 so all chars mean something.
         exitstack.push(file)
         return file

tests/test.py

@@ -207 +207 @@
                 else:
                         if os.stat(out_file).st_size < 1048576:
-                                with open (out_file, "r") as myfile:
+                                with open (out_file, "r", encoding='latin-1') as myfile:  # use latin-1 so all chars mean something.
                                         error = myfile.read()
                         else: