Changeset 08f3ad3 for tests

Timestamp:

Sep 21, 2020, 11:37:28 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7a80113

Parents:

31a6f38 (diff), ace2e92 (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 into master

Location:

tests

Files:

• Makefile.am (modified) (5 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 \
@@ -58 +60 @@
 # adjusted CC but without the actual distcc call
 CFACCLOCAL = $(if $(DISTCC_CFA_PATH),$(DISTCC_CFA_PATH) ${ARCH_FLAGS},$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS})
+CFACCLINK = $(CFACCLOCAL) $(if $(test), 2> $(test), ) $($(shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g'))
 
 PRETTY_PATH=mkdir -p $(dir $(abspath ${@})) && cd ${srcdir} &&
@@ -110 +113 @@
 % : %.cfa $(CFACCBIN)
         $(CFACOMPILETEST) -c -o $(abspath ${@}).o
-        $(CFACCLOCAL) $($(shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g')) $(abspath ${@}).o -o $(abspath ${@})
+        $(CFACCLINK) ${@}.o -o $(abspath ${@})
+        rm $(abspath ${@}).o
 
 # implicit rule for c++ test
@@ -137 +141 @@
 # 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
@@ -170 +178 @@
         $(CFACCLOCAL) $($(shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g')) $(abspath ${@}).o -o $(abspath ${@})
 
+# Linking tests
+# Meta tests to make sure we see linking errors (can't compile with -O2 since it may multiply number of calls)
+linking/linkerror : linking/linkerror.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -O0 -c -o $(abspath ${@}).o
+        $(CFACCLINK)  -O0 ${@}.o -o $(abspath ${@})
+        rm $(abspath ${@}).o
+
 #------------------------------------------------------------------------------
 # Other targets

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: