Changes in / [86fb8f2:1e5d0f0c]


Ignore:
Location:
tests
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • tests/Makefile.am

    r86fb8f2 r1e5d0f0c  
    4848
    4949avl_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
    50 # automake doesn't know we still need C/CPP rules so pretend like we have a C program
    51 _dummy_hack_SOURCES = .dummy_hack.c .dummy_hackxx.cpp
     50# automake doesn't know we still need C rules so pretend like we have a C program
     51_dummy_hack_SOURCES = .dummy_hack.c
    5252
    5353#----------------------------------------------------------------------------------------------------------------
    … …  
    7474        @echo "int main() { return 0; }" > ${@}
    7575
    76 .dummy_hackxx.cpp:
    77         @echo "int bar() { return 0; }" > ${@}
    78 
    7976concurrency :
    8077        @+${TEST_PY} --debug=${debug}  --install=${installed} -Iconcurrent
    … …  
    8582% : %.cfa $(CFACC)
    8683        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    87 
    88 % : %.cpp
    89         $(PRETTY_PATH) $(CXXCOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    9084
    9185declarationSpecifier: declarationSpecifier.cfa $(CFACC)

  • tests/Makefile.in

    r86fb8f2 r1e5d0f0c  
    107107CONFIG_CLEAN_FILES = config.py
    108108CONFIG_CLEAN_VPATH_FILES = test.py
    109 am__dummy_hack_OBJECTS = .dummy_hack.$(OBJEXT) .dummy_hackxx.$(OBJEXT)
     109am__dummy_hack_OBJECTS = .dummy_hack.$(OBJEXT)
    110110_dummy_hack_OBJECTS = $(am__dummy_hack_OBJECTS)
    111111_dummy_hack_LDADD = $(LDADD)
    … …  
    155155am__v_CCLD_0 = @echo "  CCLD    " $@;
    156156am__v_CCLD_1 =
    157 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    158         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    159 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
    160         $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
    161         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    162         $(AM_CXXFLAGS) $(CXXFLAGS)
    163 AM_V_CXX = $(am__v_CXX_@AM_V@)
    164 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
    165 am__v_CXX_0 = @echo "  CXX     " $@;
    166 am__v_CXX_1 =
    167 CXXLD = $(CXX)
    168 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
    169         $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
    170         $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    171 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
    172 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
    173 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
    174 am__v_CXXLD_1 =
    175157SOURCES = $(_dummy_hack_SOURCES) $(avl_test_SOURCES)
    176158DIST_SOURCES = $(_dummy_hack_SOURCES) $(avl_test_SOURCES)
    … …  
    386368PRETTY_PATH = cd ${srcdir} &&
    387369avl_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
    388 # automake doesn't know we still need C/CPP rules so pretend like we have a C program
    389 _dummy_hack_SOURCES = .dummy_hack.c .dummy_hackxx.cpp
     370# automake doesn't know we still need C rules so pretend like we have a C program
     371_dummy_hack_SOURCES = .dummy_hack.c
    390372all: all-am
    391373
    392374.SUFFIXES:
    393 .SUFFIXES: .c .cfa .cpp .dummy_hack .dummy_hackxx .lo .o .obj .validate
     375.SUFFIXES: .c .cfa .dummy_hack .lo .o .obj .validate
    394376$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/src/cfa.make $(am__configure_deps)
    395377        @for dep in $?; do \
    … …  
    427409.dummy_hack$(EXEEXT): $(_dummy_hack_OBJECTS) $(_dummy_hack_DEPENDENCIES) $(EXTRA__dummy_hack_DEPENDENCIES)
    428410        @rm -f .dummy_hack$(EXEEXT)
    429         $(AM_V_CXXLD)$(CXXLINK) $(_dummy_hack_OBJECTS) $(_dummy_hack_LDADD) $(LIBS)
     411        $(AM_V_CCLD)$(LINK) $(_dummy_hack_OBJECTS) $(_dummy_hack_LDADD) $(LIBS)
    430412avltree/$(am__dirstamp):
    431413        @$(MKDIR_P) avltree
    … …  
    461443
    462444@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/.dummy_hack.Po@am__quote@
    463 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/.dummy_hackxx.Po@am__quote@
    464445
    465446.c.o:
    … …  
    486467@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    487468@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
    488 
    489 .cpp.o:
    490 @am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
    491 @am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    492 @am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
    493 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    494 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    495 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
    496 
    497 .cpp.obj:
    498 @am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
    499 @am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
    500 @am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
    501 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    502 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    503 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    504 
    505 .cpp.lo:
    506 @am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
    507 @am__fastdepCXX_TRUE@   $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    508 @am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
    509 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    510 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    511 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
    512469
    513470mostlyclean-libtool:
    … …  
    760717        @echo "int main() { return 0; }" > ${@}
    761718
    762 .dummy_hackxx.cpp:
    763         @echo "int bar() { return 0; }" > ${@}
    764 
    765719concurrency :
    766720        @+${TEST_PY} --debug=${debug}  --install=${installed} -Iconcurrent
    … …  
    772726        $(PRETTY_PATH) $(CFACOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    773727
    774 % : %.cpp
    775         $(PRETTY_PATH) $(CXXCOMPILE) $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})
    776 
    777728declarationSpecifier: declarationSpecifier.cfa $(CFACC)
    778729        $(PRETTY_PATH) $(CFACOMPILE) -CFA -XCFA -p $(shell realpath --relative-to=${srcdir} ${<}) -o $(abspath ${@})

  • tests/pybin/tools.py

    r86fb8f2 r1e5d0f0c  
    3737        # otherwise create a pipe and run the desired command
    3838        else :
    39                 try:
    40                         proc = subprocess.run(
    41                                 cmd,
    42                                 stdout=None if print2stdout else PIPE,
    43                                 stderr=STDOUT,
    44                                 shell=True,
    45                                 timeout=settings.timeout.single if timeout else None
    46                         )
    47                         return proc.returncode, proc.stdout.decode("utf-8") if proc.stdout else None
    48                 except subprocess.TimeoutExpired:
    49                         return 124, str(None)
     39                proc = subprocess.run(
     40                        cmd,
     41                        stdout=None if print2stdout else PIPE,
     42                        stderr=STDOUT,
     43                        shell=True,
     44                        timeout=settings.timeout.single if timeout else None
     45                )
     46                return proc.returncode, proc.stdout
    5047
    5148def is_ascii(fname):

  • tests/test.py

    r86fb8f2 r1e5d0f0c  
    174174
    175175                ret, info = core_info(exe_file)
    176                 error = error + info if error else info
     176                error = error + info
    177177
    178178
    … …  
    198198                out = sys.stdout
    199199                if error :
    200                         text = text + '\n' + error
     200                        text = text + "\n" + error
    201201                        out = sys.stderr
    202202
    … …  
    288288                settings.update_make_cmd(forceJobs, options.jobs)
    289289
    290                 print('%s %i tests on %i cores (%s:%s)' % (
    291                         'Regenerating' if settings.generating else 'Running',
    292                         len(tests),
    293                         options.jobs,
     290                print('%s (%s:%s) on %i cores' % (
     291                        'Regenerate tests' if settings.generating else 'Running',
    294292                        settings.arch.string,
    295                         settings.debug.string
     293                        settings.debug.string,
     294                        options.jobs
    296295                ))
    297296
Note: See TracChangeset for help on using the changeset viewer.