Changeset bd9bcc8 for src/tests

Timestamp:

Feb 20, 2017, 12:05:49 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

3bff885

Parents:

facc44f (diff), d150ea2 (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:

src/tests

Files:

• .expect/32/KRfunctions.txt (added)
• .expect/64/KRfunctions.txt (added)
• KRfunctions.c (added)
• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (1 diff)
• dtor-early-exit.c (modified) (3 diffs)

src/tests/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon Feb  6 16:10:43 2017
-## Update Count     : 40
+## Last Modified On : Thu Feb 16 15:27:50 2017
+## Update Count     : 41
 ###############################################################################
 
@@ -68 +68 @@
         ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
+KRfunctions : KRfunctions.c
+        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+
 memberCtors-ERR1: memberCtors.c
         ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}

src/tests/Makefile.in

@@ -689 +689 @@
         ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
+KRfunctions : KRfunctions.c
+        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+
 memberCtors-ERR1: memberCtors.c
         ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}

src/tests/dtor-early-exit.c

@@ -1 @@
-// 
+//
 // 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.
-// 
-// dtor-early-exit.c -- 
-// 
+//
+// dtor-early-exit.c --
+//
 // Author           : Rob Schluntz
 // Created On       : Wed Aug 17 08:26:25 2016
@@ -12 +12 @@
 // Last Modified On : Wed Aug 17 08:29:37 2016
 // Update Count     : 2
-// 
+//
 
 #include <fstream>
@@ -213 +213 @@
                 // S_G-S_L = {}
         }
+#ifdef ERR2
         // S_G = {}
-#ifdef ERR2
         if (i == 5) goto L2; // this is an error in g++ because it skips initialization of y, x
         // S_L-S_G = { y, x } => non-empty, so error