Changeset 40a1392 for tests

Timestamp:

Oct 9, 2020, 6:12:50 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:

04423b53

Parents:

3ca7ef3 (diff), 8fc9a5f (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:

• .expect/array.txt (modified) (1 diff)
• .expect/const-init.txt (added)
• .expect/expression.txt (modified) (1 diff)
• .expect/limits.txt (modified) (1 diff)
• array.cfa (modified) (3 diffs)
• const-init.cfa (added)
• exceptions/defaults.cfa (modified) (1 diff)
• expression.cfa (modified) (1 diff)
• limits.cfa (modified) (1 diff)

tests/.expect/array.txt

@@ -1 +1 @@
 array.cfa: In function '_X4mainFi___1':
-array.cfa:54:9: note: #pragma message: Compiled
+array.cfa:55:9: note: #pragma message: Compiled

tests/.expect/expression.txt

@@ -1 +1 @@
 expression.cfa: In function '_X4mainFi___1':
-expression.cfa:88:9: note: #pragma message: Compiled
+expression.cfa:89:9: note: #pragma message: Compiled

tests/.expect/limits.txt

@@ -1 +1 @@
 limits.cfa: In function '_X4mainFi_iPPKc__1':
-limits.cfa:151:9: note: #pragma message: Compiled
+limits.cfa:154:9: note: #pragma message: Compiled

tests/array.cfa

@@ -1 @@
-//                               -*- Mode: C -*- 
-// 
+//                               -*- Mode: C -*-
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
+//
 // array.cfa -- test array declarations
-// 
+//
 // Author           : Peter A. Buhr
 // Created On       : Tue Feb 19 21:18:06 2019
@@ -13 +13 @@
 // Last Modified On : Sun Sep 27 09:05:40 2020
 // Update Count     : 4
-// 
+//
 
 int a1[0];
@@ -50 +50 @@
 
 int main() {
-        #pragma message( "Compiled" )                                           // force non-empty .expect file
+        #if !defined(NO_COMPILED_PRAGMA)
+                #pragma message( "Compiled" )   // force non-empty .expect file
+        #endif
 }
 

tests/exceptions/defaults.cfa

@@ -55 +55 @@
 
 void unhandled_test(void) {
-        forall(dtype T | is_exception(T))
+        forall(dtype T, dtype V | is_exception(T, V))
         void defaultTerminationHandler(T &) {
                 throw (unhandled_exception){};

tests/expression.cfa

@@ -84 +84 @@
         (S)@{2}`mary;
 
-        #pragma message( "Compiled" )                   // force non-empty .expect file
+        #if !defined(NO_COMPILED_PRAGMA)
+                #pragma message( "Compiled" )   // force non-empty .expect file
+        #endif
 } // main

tests/limits.cfa

@@ -13 +13 @@
 // Update Count     : 10
 //
+
+// Note: For testing the ability to load the constants defined in libcfa/src/limits.cfa,
+// see discussion in test const-init.
 
 #include <limits.hfa>