Changeset d65f92c for tests


Ignore:
Timestamp:
Aug 15, 2019, 10:21:36 AM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
5c4a473
Parents:
1ee048f
Message:

Tests almost work, the only issue left is using -E and -CFA together

Location:
tests
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • tests/Makefile.am

    r1ee048f rd65f92c  
    3434
    3535# applies to both programs
     36# since automake doesn't have support for CFA we have to
    3637AM_CFLAGS = $(if $(test), 2> $(test), ) \
    3738        -g \
    … …  
    4142        -DIN_DIR="${abs_srcdir}/.in/"
    4243
    43 AM_CFLAGS += ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS}
    44 CC = @CFACC@
     44CC = $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) -dist-tree -in-tree,@CFACC@ ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS})
     45CFACCBIN = @CFACC@
     46CFACC = $(CC)
    4547
    4648PRETTY_PATH=mkdir -p $(dir $(abspath ${@})) && cd ${srcdir} &&
    … …  
    5658#----------------------------------------------------------------------------------------------------------------
    5759all-local :
    58         @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} ${quick_test}
     60        @+${TEST_PY} --debug=${debug} --install=${installed} ${concurrent} ${timeouts} ${quick_test}
    5961
    6062all-tests :
    61         @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
     63        @+${TEST_PY} --debug=${debug} --install=${installed} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
    6264
    6365clean-local :
    … …  
    8688
    8789# Use for all tests, make sure the path are correct and all flags are added
    88 CFACOMPILETEST=$(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) $($(shell echo "${@}_FLAGS" | sed 's/-\|\//_/g'))
     90CFACOMPILETEST=$(PRETTY_PATH) $(CFACOMPILE) -c $(shell realpath --relative-to=${srcdir} ${<}) $($(shell echo "${@}_FLAGS" | sed 's/-\|\//_/g'))
    8991
    90 # Use for tests that either generate an executable, print directyl to stdout or the make command is expected to fail
     92# Use for tests that either generate an executable, print directly to stdout or the make command is expected to fail
    9193CFATEST_STDOUT=$(CFACOMPILETEST) -o $(abspath ${@})
    9294
    … …  
    9799
    98100# implicit rule so not all test require a rule
    99 % : %.cfa $(CFACC)
    100         $(CFATEST_STDOUT)
     101% : %.cfa $(CFACCBIN)
     102        $(CFACOMPILETEST) -o $(abspath ${@}).o
     103        $(CFACC) $(abspath ${@}).o -o $(abspath ${@})
     104
    101105
    102106% : %.cpp
    … …  
    122126# CUSTOM TARGET
    123127#------------------------------------------------------------------------------
    124 typedefRedef-ERR1: typedefRedef.cfa $(CFACC)
     128typedefRedef-ERR1: typedefRedef.cfa $(CFACCBIN)
    125129        $(CFATEST_STDOUT) -DERR1
    126130
    127 alloc-ERROR: alloc.cfa $(CFACC)
     131alloc-ERROR: alloc.cfa $(CFACCBIN)
    128132        $(CFATEST_STDOUT) -DERR1
    129133
    130 nested-types-ERR1: nested-types.cfa $(CFACC)
     134nested-types-ERR1: nested-types.cfa $(CFACCBIN)
    131135        $(CFATEST_STDOUT) -DERR1
    132136
    133 nested-types-ERR2: nested-types.cfa $(CFACC)
     137nested-types-ERR2: nested-types.cfa $(CFACCBIN)
    134138        $(CFATEST_STDOUT) -DERR2
    135139
    136 raii/dtor-early-exit-ERR1: raii/dtor-early-exit.cfa $(CFACC)
     140raii/dtor-early-exit-ERR1: raii/dtor-early-exit.cfa $(CFACCBIN)
    137141        $(CFATEST_STDOUT) -DERR1
    138142
    139 raii/dtor-early-exit-ERR2: raii/dtor-early-exit.cfa $(CFACC)
     143raii/dtor-early-exit-ERR2: raii/dtor-early-exit.cfa $(CFACCBIN)
    140144        $(CFATEST_STDOUT) -DERR2
    141145
    142 raii/memberCtors-ERR1: raii/memberCtors.cfa $(CFACC)
     146raii/memberCtors-ERR1: raii/memberCtors.cfa $(CFACCBIN)
    143147        $(CFATEST_STDOUT) -DERR1
    144148
    145 raii/ctor-autogen-ERR1: raii/ctor-autogen.cfa $(CFACC)
     149raii/ctor-autogen-ERR1: raii/ctor-autogen.cfa $(CFACCBIN)
    146150        $(CFATEST_STDOUT) -DERR1
    147151
    148152#builtins
    149 builtins/sync: builtins/sync.cfa $(CFACC)
     153builtins/sync: builtins/sync.cfa $(CFACCBIN)
    150154        $(CFATEST_STDERR) -fsyntax-only
    151155
    152156# Warnings
    153 warnings/self-assignment: warnings/self-assignment.cfa $(CFACC)
     157warnings/self-assignment: warnings/self-assignment.cfa $(CFACCBIN)
    154158        $(CFATEST_STDERR) -fsyntax-only

  • tests/Makefile.in

    r1ee048f rd65f92c  
    212212AWK = @AWK@
    213213BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    214 CC = @CFACC@
     214CC = $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) -dist-tree -in-tree,@CFACC@ ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS})
    215215CCAS = @CCAS@
    216216CCASDEPMODE = @CCASDEPMODE@
    217217CCASFLAGS = @CCASFLAGS@
    218218CCDEPMODE = @CCDEPMODE@
    219 CFACC = @CFACC@
     219CFACC = $(CC)
    220220CFACPP = @CFACPP@
    221221CFA_BACKEND_CC = @CFA_BACKEND_CC@
    … …  
    248248FGREP = @FGREP@
    249249GREP = @GREP@
     250HAS_DISTCC = @HAS_DISTCC@
    250251HOST_FLAGS = @HOST_FLAGS@
    251252INSTALL = @INSTALL@
    … …  
    385386
    386387# applies to both programs
    387 AM_CFLAGS = $(if $(test), 2> $(test), ) -g -Wall -Wno-unused-function \
    388         -quiet @CFA_FLAGS@ -DIN_DIR="${abs_srcdir}/.in/" \
    389         ${DEBUG_FLAGS} ${INSTALL_FLAGS} ${ARCH_FLAGS}
     388# since automake doesn't have support for CFA we have to
     389AM_CFLAGS = $(if $(test), 2> $(test), ) \
     390        -g \
     391        -Wall \
     392        -Wno-unused-function \
     393        -quiet @CFA_FLAGS@ \
     394        -DIN_DIR="${abs_srcdir}/.in/"
     395
     396CFACCBIN = @CFACC@
    390397PRETTY_PATH = mkdir -p $(dir $(abspath ${@})) && cd ${srcdir} &&
    391398avl_test_SOURCES = avltree/avl_test.cfa avltree/avl0.cfa avltree/avl1.cfa avltree/avl2.cfa avltree/avl3.cfa avltree/avl4.cfa avltree/avl-private.cfa
    … …  
    396403
    397404# Use for all tests, make sure the path are correct and all flags are added
    398 CFACOMPILETEST = $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) $($(shell echo "${@}_FLAGS" | sed 's/-\|\//_/g'))
    399 
    400 # Use for tests that either generate an executable, print directyl to stdout or the make command is expected to fail
     405CFACOMPILETEST = $(PRETTY_PATH) $(CFACOMPILE) -c $(shell realpath --relative-to=${srcdir} ${<}) $($(shell echo "${@}_FLAGS" | sed 's/-\|\//_/g'))
     406
     407# Use for tests that either generate an executable, print directly to stdout or the make command is expected to fail
    401408CFATEST_STDOUT = $(CFACOMPILETEST) -o $(abspath ${@})
    402409
    … …  
    770777#----------------------------------------------------------------------------------------------------------------
    771778all-local :
    772         @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} ${quick_test}
     779        @+${TEST_PY} --debug=${debug} --install=${installed} ${concurrent} ${timeouts} ${quick_test}
    773780
    774781all-tests :
    775         @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
     782        @+${TEST_PY} --debug=${debug} --install=${installed} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
    776783
    777784clean-local :
    … …  
    800807
    801808# implicit rule so not all test require a rule
    802 % : %.cfa $(CFACC)
    803         $(CFATEST_STDOUT)
     809% : %.cfa $(CFACCBIN)
     810        $(CFACOMPILETEST) -o $(abspath ${@}).o
     811        $(CFACC) $(abspath ${@}).o -o $(abspath ${@})
    804812
    805813% : %.cpp
    … …  
    809817# CUSTOM TARGET
    810818#------------------------------------------------------------------------------
    811 typedefRedef-ERR1: typedefRedef.cfa $(CFACC)
     819typedefRedef-ERR1: typedefRedef.cfa $(CFACCBIN)
    812820        $(CFATEST_STDOUT) -DERR1
    813821
    814 alloc-ERROR: alloc.cfa $(CFACC)
     822alloc-ERROR: alloc.cfa $(CFACCBIN)
    815823        $(CFATEST_STDOUT) -DERR1
    816824
    817 nested-types-ERR1: nested-types.cfa $(CFACC)
     825nested-types-ERR1: nested-types.cfa $(CFACCBIN)
    818826        $(CFATEST_STDOUT) -DERR1
    819827
    820 nested-types-ERR2: nested-types.cfa $(CFACC)
     828nested-types-ERR2: nested-types.cfa $(CFACCBIN)
    821829        $(CFATEST_STDOUT) -DERR2
    822830
    823 raii/dtor-early-exit-ERR1: raii/dtor-early-exit.cfa $(CFACC)
     831raii/dtor-early-exit-ERR1: raii/dtor-early-exit.cfa $(CFACCBIN)
    824832        $(CFATEST_STDOUT) -DERR1
    825833
    826 raii/dtor-early-exit-ERR2: raii/dtor-early-exit.cfa $(CFACC)
     834raii/dtor-early-exit-ERR2: raii/dtor-early-exit.cfa $(CFACCBIN)
    827835        $(CFATEST_STDOUT) -DERR2
    828836
    829 raii/memberCtors-ERR1: raii/memberCtors.cfa $(CFACC)
     837raii/memberCtors-ERR1: raii/memberCtors.cfa $(CFACCBIN)
    830838        $(CFATEST_STDOUT) -DERR1
    831839
    832 raii/ctor-autogen-ERR1: raii/ctor-autogen.cfa $(CFACC)
     840raii/ctor-autogen-ERR1: raii/ctor-autogen.cfa $(CFACCBIN)
    833841        $(CFATEST_STDOUT) -DERR1
    834842
    835843#builtins
    836 builtins/sync: builtins/sync.cfa $(CFACC)
     844builtins/sync: builtins/sync.cfa $(CFACCBIN)
    837845        $(CFATEST_STDERR) -fsyntax-only
    838846
    839847# Warnings
    840 warnings/self-assignment: warnings/self-assignment.cfa $(CFACC)
     848warnings/self-assignment: warnings/self-assignment.cfa $(CFACCBIN)
    841849        $(CFATEST_STDERR) -fsyntax-only
    842850

  • tests/config.py.in

    r1ee048f rd65f92c  
    88BUILDDIR = "@abs_builddir@"
    99HOSTARCH = "@host_cpu@"
     10DISTRIBUTE = @HAS_DISTCC@

  • tests/pybin/settings.py

    r1ee048f rd65f92c  
    1111        SRCDIR = os.path.abspath(config.SRCDIR)
    1212        BUILDDIR = os.path.abspath(config.BUILDDIR)
     13        distribute = config.DISTRIBUTE
    1314        os.chdir(testpath)
    1415
    … …  
    8586                self.string = "debug" if value else "no debug"
    8687                self.flags  = """DEBUG_FLAGS=%s""" % ("-debug -O0" if value else "-nodebug -O2")
     88                self.path   = "debug" if value else "nodebug"
    8789
    8890class Install:
    8991        def __init__(self, value):
     92                if value:
     93                        distribute = False
     94
    9095                self.string = "installed" if value else "in-tree"
    9196                self.flags  = """INSTALL_FLAGS=%s""" % ("" if value else "-in-tree")
    … …  
    113118        global timeout
    114119        global output_width
     120        global distcc
    115121
    116122        dry_run      = options.dry_run
    … …  
    122128        timeout      = Timeouts(options.timeout, options.global_timeout)
    123129        output_width = 24
     130        distcc       = "DISTCC_CFA_PATH=~/.cfadistcc/%s/cfa" % tools.config_hash()
    124131
     132        if distribute and not os.environ.get('DISTCC_LOG'):
     133                os.putenv('DISTCC_LOG', os.path.join(BUILDDIR, 'distcc_error.log'))
    125134
    126135def update_make_cmd(force, jobs):
    … …  
    131140def validate():
    132141        errf = os.path.join(BUILDDIR, ".validate.err")
    133         make_ret, out = tools.make( ".validate", error_file = errf, output=subprocess.DEVNULL, error=subprocess.DEVNULL )
     142        make_ret, out = tools.make( ".validate", error_file = errf, output_file=subprocess.DEVNULL, error=subprocess.DEVNULL )
    134143        if make_ret != 0:
    135144                with open (errf, "r") as myfile:

  • tests/pybin/tools.py

    r1ee048f rd65f92c  
    2222
    2323# helper functions to run terminal commands
    24 def sh(*cmd, timeout = False, output = None, input = None, error = subprocess.STDOUT):
     24def sh(*cmd, timeout = False, output_file = None, input_file = None, input_text = None, error = subprocess.STDOUT):
    2525        cmd = list(cmd)
     26
     27        if input_file and input_text:
     28                return 401, "Cannot use both text and file inputs"
    2629
    2730        # if this is a dry_run, only print the commands that would be ran
    2831        if settings.dry_run :
    2932                cmd = "{} cmd: {}".format(os.getcwd(), ' '.join(cmd))
    30                 if output and not isinstance(output, int):
     33                if output_file and not isinstance(output_file, int):
    3134                        cmd += " > "
    32                         cmd += output
     35                        cmd += output_file
    3336
    3437                if error and not isinstance(error, int):
    … …  
    3639                        cmd += error
    3740
    38                 if input and not isinstance(input, int) and os.path.isfile(input):
     41                if input_file and not isinstance(input_file, int) and os.path.isfile(input_file):
    3942                        cmd += " < "
    40                         cmd += input
     43                        cmd += input_file
    4144
    4245                print(cmd)
    … …  
    4548        with contextlib.ExitStack() as onexit:
    4649                # add input redirection if needed
    47                 input = openfd(input, 'r', onexit, True)
     50                input_file = openfd(input_file, 'r', onexit, True)
    4851
    4952                # add output redirection if needed
    50                 output = openfd(output, 'w', onexit, False)
     53                output_file = openfd(output_file, 'w', onexit, False)
    5154
    5255                # add error redirection if needed
    … …  
    5760                        proc = subprocess.run(
    5861                                cmd,
    59                                 stdin =input,
    60                                 stdout=output,
    61                                 stderr=error,
    62                                 timeout=settings.timeout.single if timeout else None
     62                                **({'input' : bytes(input_text, encoding='utf-8')} if input_text else {'stdin' : input_file}),
     63                                stdout  = output_file,
     64                                stderr  = error,
     65                                timeout = settings.timeout.single if timeout else None
    6366                        )
     67
    6468                        return proc.returncode, proc.stdout.decode("utf-8") if proc.stdout else None
    6569                except subprocess.TimeoutExpired:
    … …  
    7478                return False
    7579
    76         code, out = sh("file %s" % fname, output=subprocess.PIPE)
     80        code, out = sh("file %s" % fname, output_file=subprocess.PIPE)
    7781        if code != 0:
    7882                return False
    … …  
    106110        if isinstance(files, str ): files = [ files ]
    107111        for file in files:
    108                 sh( 'rm', '-f', file, output=subprocess.DEVNULL, error=subprocess.DEVNULL )
     112                sh( 'rm', '-f', file, output_file=subprocess.DEVNULL, error=subprocess.DEVNULL )
    109113
    110114# Create 1 or more directory
    … …  
    114118                p = os.path.normpath( file )
    115119                d = os.path.dirname ( p )
    116                 sh( 'mkdir', '-p', d, output=subprocess.DEVNULL, error=subprocess.DEVNULL )
     120                sh( 'mkdir', '-p', d, output_file=subprocess.DEVNULL, error=subprocess.DEVNULL )
    117121
    118122
    … …  
    137141                lhs,
    138142                rhs,
    139                 output=subprocess.PIPE
     143                output_file=subprocess.PIPE
    140144        )
    141145
    142146# call make
    143 def make(target, *, flags = '', output = None, error = None, error_file = None, silent = False):
     147def make(target, *, flags = '', output_file = None, error = None, error_file = None, silent = False):
    144148        test_param = """test="%s" """ % (error_file) if error_file else None
    145149        cmd = [
    … …  
    150154                settings.debug.flags,
    151155                settings.install.flags,
     156                settings.distcc if settings.distribute else None,
    152157                flags,
    153158                target
    154159        ]
    155160        cmd = [s for s in cmd if s]
    156         return sh(*cmd, output=output, error=error)
     161        return sh(*cmd, output_file=output_file, error=error)
    157162
    158163def which(program):
    … …  
    200205# cat one file into the other
    201206def cat(source, dest):
    202         ret, _ = sh("cat", source, output=dest)
     207        ret, _ = sh("cat", source, output_file=dest)
    203208        return ret
    204209
    … …  
    273278################################################################################
    274279
     280# get hash for given configuration
     281def config_hash():
     282        path = os.path.normpath(os.path.join(
     283                settings.SRCDIR,
     284        ))
     285
     286        distcc_hash = os.path.join(settings.SRCDIR, '../tools/build/distcc_hash')
     287        config = "%s-%s" % (settings.arch.target, settings.debug.path)
     288        _, out = sh(distcc_hash, config, output_file=subprocess.PIPE)
     289        return out.strip()
     290
    275291# check if arguments is yes or no
    276292def yes_no(string):
    … …  
    302318                return 1, "ERR No core dump"
    303319
    304         return sh('gdb', '-n', path, core, '-batch', '-x', cmd, output=subprocess.PIPE)
     320        return sh('gdb', '-n', path, core, '-batch', '-x', cmd, output_file=subprocess.PIPE)
    305321
    306322class Timed:

  • tests/test.py

    r1ee048f rd65f92c  
    142142        # build, skipping to next test on error
    143143        with Timed() as comp_dur:
    144                 make_ret, _ = make( test.target(), output=subprocess.DEVNULL, error=out_file, error_file = err_file )
     144                make_ret, _ = make( test.target(), output_file=subprocess.DEVNULL, error=out_file, error_file = err_file )
    145145
    146146        run_dur = None
    … …  
    152152                                if settings.dry_run or is_exe(exe_file):
    153153                                        # run test
    154                                         retcode, _ = sh(exe_file, output=out_file, input=in_file, timeout=True)
     154                                        retcode, _ = sh(exe_file, output_file=out_file, input_file=in_file, timeout=True)
    155155                                else :
    156156                                        # simply cat the result into the output
    … …  
    215215def run_tests(tests, jobs) :
    216216        # clean the sandbox from previous commands
    217         make('clean', output=subprocess.DEVNULL, error=subprocess.DEVNULL)
     217        make('clean', output_file=subprocess.DEVNULL, error=subprocess.DEVNULL)
    218218
    219219        # create the executor for our jobs and handle the signal properly
    … …  
    256256
    257257        # clean the workspace
    258         make('clean', output=subprocess.DEVNULL, error=subprocess.DEVNULL)
     258        make('clean', output_file=subprocess.DEVNULL, error=subprocess.DEVNULL)
    259259
    260260        return 1 if failed else 0
Note: See TracChangeset for help on using the changeset viewer.