Changeset cbdf565

Timestamp:

Jul 23, 2018, 5:21:46 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

2514607d

Parents:

552f5cb

Message:

Tests which now include files must use the IN_DIR macro

Location:

src/tests

Files:

• .in/io.data (moved) (moved from src/tests/io.data)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• io2.c (modified) (3 diffs)

src/tests/Makefile.am

@@ -44 +44 @@
 TEST_FLAGS = $(if $(test), 2> $(test), )
 AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
-CC = ${abs_top_builddir}/src/driver/cfa -I${srcdir}
+CC = ${abs_top_builddir}/src/driver/cfa -I${srcdir} -DIN_DIR="${srcdir}/.in/"
 
 .PHONY : list

src/tests/Makefile.in

@@ -193 +193 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
-CC = ${abs_top_builddir}/src/driver/cfa -I${srcdir}
+CC = ${abs_top_builddir}/src/driver/cfa -I${srcdir} -DIN_DIR="${srcdir}/.in/"
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@

src/tests/io2.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.
-// 
-// io2.c -- 
-// 
+//
+// io2.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed Mar  2 16:56:02 2016
@@ -12 +12 @@
 // Last Modified On : Thu May 24 21:17:41 2018
 // Update Count     : 103
-// 
+//
 
 #include <fstream>
+
+ #define xstr(s) str(s)
+#define str(s) #s
 
 int main() {
@@ -38 +41 @@
         char s1[size], s2[size];
 
-        ifstream in = { "io.data" };                                            // create / open file
+        ifstream in = { xstr(IN_DIR) "io.data" };                                               // create / open file
 
         sout | "input bacis types" | endl;