Changeset 28582b2

Timestamp:

Aug 6, 2018, 2:05:02 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

ff593a3

Parents:

37fe352

Message:

Better handling of missing configurations

Files:

• driver/cfa.cc (modified) (1 diff)
• tests/Makefile.am (modified) (2 diffs)
• tests/Makefile.in (modified) (3 diffs)
• tests/pybin/settings.py (modified) (2 diffs)
• tests/pybin/tools.py (modified) (1 diff)
• tests/test.py (modified) (2 diffs)

driver/cfa.cc

@@ -355 +355 @@
                 libdir = string(CFA_LIBDIR) + arch + config;
                 if( !dirExists(libdir) ) {
-                        cerr << argv[0] << " internal error, cannot find prelude directory." << endl;
-                        cerr << "Was looking for " << libdir << endl;
+                        cerr << argv[0] << " internal error, configuration " << config << " not installed." << endl;
                         libdir = string(CFA_LIBDIR) + arch + "nolib";
                 }

tests/Makefile.am

@@ -37 +37 @@
 CC = @CFACC@
 
-.PHONY : list
+.PHONY: list .validate
+.INTERMEDIATE: .validate .validate.c
 EXTRA_PROGRAMS = fstream_test avl_test # build but do not install
 
@@ -55 +56 @@
 list :
         @+${TEST_PY} --list ${concurrent}
+
+.validate: .validate.c
+        @$(COMPILE) .validate.c -fsyntax-only
+
+.validate.c:
+        @echo "int main() { return 0; }" > ${@}
 
 concurrency :

tests/Makefile.in

@@ -316 +316 @@
 
 .SUFFIXES:
-.SUFFIXES: .c .o .obj
+.SUFFIXES: .c .o .obj .validate
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
@@ -614 +614 @@
 
 
-.PHONY : list
+.PHONY: list .validate
+.INTERMEDIATE: .validate .validate.c
 
 all-local :
@@ -627 +628 @@
 list :
         @+${TEST_PY} --list ${concurrent}
+
+.validate: .validate.c
+        @$(COMPILE) .validate.c -fsyntax-only
+
+.validate.c:
+        @echo "int main() { return 0; }" > ${@}
 
 concurrency :

tests/pybin/settings.py

@@ -3 +3 @@
 import os
 import sys
+import tools
 
 try :
@@ -85 +86 @@
 
         make = "make" if not force else ("make -j%i" % jobs)
+
+def validate():
+        make_ret, _ = tools.make( ".validate", error_file = ".validate.err", redirects  = "2> /dev/null 1> /dev/null", )
+        if make_ret != 0:
+                with open (".validate.err", "r") as myfile:
+                        error=myfile.read()
+                print('ERROR: Invalid configuration', file=sys.stderr)
+                print("       verify returned : \n%s" % error, file=sys.stderr)
+                tools.rm("%s/.validate.err" % BUILDDIR)
+                sys.exit(1)
+
+        tools.rm("%s/.validate.err" % BUILDDIR)

tests/pybin/tools.py

@@ -52 +52 @@
 # Remove 1 or more files silently
 def rm( files ):
-        try:
+        if isinstance( files, basestring ):
+                sh("rm -f %s > /dev/null 2>&1" % files )
+        else:
                 for file in files:
                         sh("rm -f %s > /dev/null 2>&1" % file )
-        except TypeError:
-                sh("rm -f %s > /dev/null 2>&1" % files )
 
 # Create 1 or more directory
 def mkdir( files ):
-        try:
+        if isinstance( files, basestring ):
+                sh("mkdir -p %s" % os.path.dirname(files) )
+        else:
                 for file in files:
                         sh("mkdir -p %s" % os.path.dirname(file) )
-        except TypeError:
-                sh("mkdir -p %s" % os.path.dirname(files) )
+
 
 def chdir( dest = __main__.__file__ ):

tests/test.py

@@ -85 +85 @@
         # create a parser with the arguments for the tests script
         parser = argparse.ArgumentParser(description='Script which runs cforall tests')
-        parser.add_argument('--debug', help='Run all tests in debug or release', type=yes_no, default='no')
+        parser.add_argument('--debug', help='Run all tests in debug or release', type=yes_no, default='yes')
         parser.add_argument('--arch', help='Test for specific architecture', type=str, default='')
         parser.add_argument('--dry-run', help='Don\'t run the tests, only output the commands', action='store_true')
@@ -285 +285 @@
 
         else :
+                # check the build configuration works
+                settings.validate()
+
                 options.jobs, forceJobs = jobCount( options, tests )
                 settings.updateMakeCmd(forceJobs, options.jobs)