Changeset 9bb81bb8

Timestamp:

Jul 5, 2016, 4:33:58 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

59c24b6

Parents:

159c62e (diff), 39f04ec (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 plg2:software/cfa/cfa-cc

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
@@ -308 +311 @@
                 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
@@ -314 +317 @@
                         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
 
@@ -60 +61 @@
                 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
 
 ################################################################################
@@ -78 +88 @@
                 stdinput = "< .in/%s.txt" % test if isfile(".in/%s.txt" % test) else ""
 
-                # run test
-                sh("./%s %s > %s 2>&1" % (test, stdinput, out_file), dry_run)
+                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)
 
         retcode = 0