Changeset 9bb81bb


Ignore:
Timestamp:
Jul 5, 2016, 4:33:58 PM (5 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, 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:
2 edited

Legend:

Unmodified
Added
Removed
  • src/driver/cfa.cc

    r159c62e r9bb81bb  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // cfa.cc -- 
     7// cfa.cc --
    88//
    99// Author           : Peter A. Buhr
     
    249249        nargs += 1;
    250250
     251        args[nargs] = "-I" CFA_INCDIR "/containers";
     252        nargs += 1;
     253
    251254        if ( link ) {
    252255                // include the cfa library in case it's needed
     
    308311                args[nargs] = "-no-integrated-cpp";
    309312                nargs += 1;
    310                 args[nargs] = "-Wno-deprecated"; 
     313                args[nargs] = "-Wno-deprecated";
    311314                nargs += 1;
    312315                if ( ! std_flag ) {                                                             // default c99, if none specified
     
    314317                        nargs += 1;
    315318                } // if
    316                 args[nargs] = "-fgnu89-inline"; 
     319                args[nargs] = "-fgnu89-inline";
    317320                nargs += 1;
    318321                args[nargs] = ( *new string( string("-B") + Bprefix + "/" ) ).c_str();
  • src/tests/test.py

    r159c62e r9bb81bb  
    99import os
    1010import re
     11import stat
    1112import sys
    1213
     
    6061                return result;
    6162
     63def fileIsExecutable(file) :
     64        try :
     65                fileinfo = os.stat(file)
     66                return bool(fileinfo.st_mode & stat.S_IXUSR)
     67        except Exception as inst:
     68                print(type(inst))    # the exception instance
     69                print(inst.args)     # arguments stored in .args
     70                print(inst)
     71                return False
    6272
    6373################################################################################
     
    7888                stdinput = "< .in/%s.txt" % test if isfile(".in/%s.txt" % test) else ""
    7989
    80                 # run test
    81                 sh("./%s %s > %s 2>&1" % (test, stdinput, out_file), dry_run)
     90                if fileIsExecutable(test) :
     91                        # run test
     92                        sh("./%s %s > %s 2>&1" % (test, stdinput, out_file), dry_run)
     93                else :
     94                        # simply cat the result into the output
     95                        sh("cat %s > %s" % (test, out_file), dry_run)
    8296
    8397        retcode = 0
Note: See TracChangeset for help on using the changeset viewer.