Changeset cbdf565


Ignore:
Timestamp:
Jul 23, 2018, 5:21:46 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
2514607d
Parents:
552f5cb
Message:

Tests which now include files must use the IN_DIR macro

Location:
src/tests
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • src/tests/Makefile.am

    r552f5cb rcbdf565  
    4444TEST_FLAGS = $(if $(test), 2> $(test), )
    4545AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
    46 CC = ${abs_top_builddir}/src/driver/cfa -I${srcdir}
     46CC = ${abs_top_builddir}/src/driver/cfa -I${srcdir} -DIN_DIR="${srcdir}/.in/"
    4747
    4848.PHONY : list
  • src/tests/Makefile.in

    r552f5cb rcbdf565  
    193193AWK = @AWK@
    194194BACKEND_CC = @BACKEND_CC@
    195 CC = ${abs_top_builddir}/src/driver/cfa -I${srcdir}
     195CC = ${abs_top_builddir}/src/driver/cfa -I${srcdir} -DIN_DIR="${srcdir}/.in/"
    196196CCAS = @CCAS@
    197197CCASDEPMODE = @CCASDEPMODE@
  • src/tests/io2.c

    r552f5cb rcbdf565  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // io2.c -- 
    8 // 
     6//
     7// io2.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Wed Mar  2 16:56:02 2016
     
    1212// Last Modified On : Thu May 24 21:17:41 2018
    1313// Update Count     : 103
    14 // 
     14//
    1515
    1616#include <fstream>
     17
     18 #define xstr(s) str(s)
     19#define str(s) #s
    1720
    1821int main() {
     
    3841        char s1[size], s2[size];
    3942
    40         ifstream in = { "io.data" };                                            // create / open file
     43        ifstream in = { xstr(IN_DIR) "io.data" };                                               // create / open file
    4144
    4245        sout | "input bacis types" | endl;
Note: See TracChangeset for help on using the changeset viewer.