Changes in / [39f04ec:d32c4e2]

Location:

src

Files:

• driver/cfa.cc (modified) (4 diffs)
• tests/test.py (modified) (3 diffs)

src/driver/cfa.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// cfa.cc --
+// cfa.cc -- 
 //
 // Author           : Peter A. Buhr
@@ -249 +249 @@
         nargs += 1;
 
-        args[nargs] = "-I" CFA_INCDIR "/containers";
-        nargs += 1;
-
         if ( link ) {
                 // include the cfa library in case it's needed
@@ -311 +308 @@
                 args[nargs] = "-no-integrated-cpp";
                 nargs += 1;
-                args[nargs] = "-Wno-deprecated";
+                args[nargs] = "-Wno-deprecated"; 
                 nargs += 1;
                 if ( ! std_flag ) {                                                             // default c99, if none specified
@@ -317 +314 @@
                         nargs += 1;
                 } // if
-                args[nargs] = "-fgnu89-inline";
+                args[nargs] = "-fgnu89-inline"; 
                 nargs += 1;
                 args[nargs] = ( *new string( string("-B") + Bprefix + "/" ) ).c_str();

src/tests/test.py

@@ -9 +9 @@
 import os
 import re
-import stat
 import sys
 
@@ -61 +60 @@
                 return result;
 
-def fileIsExecutable(file) :
-        try :
-                fileinfo = os.stat(file)
-                return bool(fileinfo.st_mode & stat.S_IXUSR)
-        except Exception as inst:
-                print(type(inst))    # the exception instance
-                print(inst.args)     # arguments stored in .args
-                print(inst)
-                return False
 
 ################################################################################
@@ -88 +78 @@
                 stdinput = "< .in/%s.txt" % test if isfile(".in/%s.txt" % test) else ""
 
-                if fileIsExecutable(test) :
-                        # run test
-                        sh("./%s %s > %s 2>&1" % (test, stdinput, out_file), dry_run)
-                else :
-                        # simply cat the result into the output
-                        sh("cat %s > %s" % (test, out_file), dry_run)
+                # run test
+                sh("./%s %s > %s 2>&1" % (test, stdinput, out_file), dry_run)
 
         retcode = 0