Changeset 762fbc1 for tests

Timestamp:

Aug 15, 2020, 12:20:44 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

36de20d

Parents:

7f51b9d (diff), 5715d43 (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) (1 diff)
• exceptions/.expect/conditional-threads.txt (added)
• exceptions/.expect/defaults-threads.txt (added)
• exceptions/.expect/finally-threads.txt (added)
• exceptions/.expect/resume-threads.txt (added)
• exceptions/.expect/terminate-threads.txt (added)
• exceptions/terminate.cfa (modified) (1 diff)
• exceptions/with-threads.hfa (added)
• linking/.expect/exception-nothreads.txt (added)
• linking/.expect/exception-withthreads.txt (added)
• linking/exception-nothreads.cfa (added)
• linking/exception-withthreads.cfa (added)
• linking/withthreads.cfa (modified) (1 diff)

tests/Makefile.am

@@ -163 +163 @@
         $(CFACOMPILETEST) -DERR2 -c -fsyntax-only -o $(abspath ${@})
 
+# Exception Tests
+# Test with libcfathread; it changes how storage works.
+
+exceptions/%-threads : exceptions/%.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -include exceptions/with-threads.hfa -c -o $(abspath ${@}).o
+        $(CFACCLOCAL) $($(shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g')) $(abspath ${@}).o -o $(abspath ${@})
+
 #------------------------------------------------------------------------------
 # Other targets

tests/exceptions/terminate.cfa

@@ -142 +142 @@
         }
 }
-

tests/linking/withthreads.cfa

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// nothreads.cfa --
+// withthreads.cfa --
 //
 // Author           : Thierry Delisle