Changeset 28582b2 for tests/pybin


Ignore:
Timestamp:
Aug 6, 2018, 2:05:02 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:
ff593a3
Parents:
37fe352
Message:

Better handling of missing configurations

Location:
tests/pybin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • tests/pybin/settings.py

    r37fe352 r28582b2  
    33import os
    44import sys
     5import tools
    56
    67try :
     
    8586
    8687        make = "make" if not force else ("make -j%i" % jobs)
     88
     89def validate():
     90        make_ret, _ = tools.make( ".validate", error_file = ".validate.err", redirects  = "2> /dev/null 1> /dev/null", )
     91        if make_ret != 0:
     92                with open (".validate.err", "r") as myfile:
     93                        error=myfile.read()
     94                print('ERROR: Invalid configuration', file=sys.stderr)
     95                print("       verify returned : \n%s" % error, file=sys.stderr)
     96                tools.rm("%s/.validate.err" % BUILDDIR)
     97                sys.exit(1)
     98
     99        tools.rm("%s/.validate.err" % BUILDDIR)
  • tests/pybin/tools.py

    r37fe352 r28582b2  
    5252# Remove 1 or more files silently
    5353def rm( files ):
    54         try:
     54        if isinstance( files, basestring ):
     55                sh("rm -f %s > /dev/null 2>&1" % files )
     56        else:
    5557                for file in files:
    5658                        sh("rm -f %s > /dev/null 2>&1" % file )
    57         except TypeError:
    58                 sh("rm -f %s > /dev/null 2>&1" % files )
    5959
    6060# Create 1 or more directory
    6161def mkdir( files ):
    62         try:
     62        if isinstance( files, basestring ):
     63                sh("mkdir -p %s" % os.path.dirname(files) )
     64        else:
    6365                for file in files:
    6466                        sh("mkdir -p %s" % os.path.dirname(file) )
    65         except TypeError:
    66                 sh("mkdir -p %s" % os.path.dirname(files) )
     67
    6768
    6869def chdir( dest = __main__.__file__ ):
Note: See TracChangeset for help on using the changeset viewer.