Changeset 3078643 for src/tests

Timestamp:

Aug 10, 2016, 2:29:44 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

be0a9d8, ef42e764

Parents:

f18a711 (diff), a563f01 (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:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (1 diff)
• labelledExit.c (modified) (2 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 : Sat Jul  9 11:23:24 2016
-## Update Count     : 35
+## Last Modified On : Tue Aug  9 15:34:57 2016
+## Update Count     : 38
 ###############################################################################
 
@@ -27 +27 @@
 
 all-local :
-        +python test.py vector_test avl_test operators numericConstants expression enum asmName array typeof cast dtor-early-exit init_once
+        @+python test.py vector_test avl_test operators numericConstants expression enum asmName array typeof cast dtor-early-exit init_once
 
 all-tests :
-        +python test.py --all
+        @+python test.py --all          # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
-        -rm -f ${EXTRA_PROGRAMS}
+        rm -f ${EXTRA_PROGRAMS}
 
 list :
-        +python test.py --list
+        @+python test.py --list
 
 constant0-1DP : constant0-1.c

src/tests/Makefile.in

@@ -635 +635 @@
 
 all-local :
-        +python test.py vector_test avl_test operators numericConstants expression enum asmName array typeof cast dtor-early-exit init_once
+        @+python test.py vector_test avl_test operators numericConstants expression enum asmName array typeof cast dtor-early-exit init_once
 
 all-tests :
-        +python test.py --all
+        @+python test.py --all          # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
-        -rm -f ${EXTRA_PROGRAMS}
+        rm -f ${EXTRA_PROGRAMS}
 
 list :
-        +python test.py --list
+        @+python test.py --list
 
 constant0-1DP : constant0-1.c

src/tests/labelledExit.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.
+// 
+// labelledExit.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Wed Aug 10 07:29:39 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 10 07:30:15 2016
+// Update Count     : 1
+// 
+
 int foo() {
         int i;
@@ -136 +151 @@
         else
                 i += 1;
-
 }
 
-int main(int argc, char const *argv[]) {
+int main( int argc, char const *argv[] ) {
         /* code */
-        return 0;
 }
 
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa LabelledExit.c" //
+// compile-command: "cfa labelledExit.c" //
 // End: //