Renamed regression-tests to tests in preparation for the addition of other types of tests.
This commit is contained in:
parent
08613960e2
commit
0bf7ddcc7f
|
@ -81,7 +81,7 @@ platform/galileo/bsp/grub/bin/
|
||||||
*.prg
|
*.prg
|
||||||
*.dsc
|
*.dsc
|
||||||
|
|
||||||
#regression tests artifacts
|
#test artifacts
|
||||||
*.testlog
|
*.testlog
|
||||||
*.log.prog
|
*.log.prog
|
||||||
*.report
|
*.report
|
||||||
|
@ -90,8 +90,8 @@ summary
|
||||||
*.runerr
|
*.runerr
|
||||||
*.runlog
|
*.runlog
|
||||||
*.faillog
|
*.faillog
|
||||||
regression-tests/[0-9][0-9]-*/report
|
tests/[0-9][0-9]-*/report
|
||||||
regression-tests/[0-9][0-9]-*/org/
|
tests/[0-9][0-9]-*/org/
|
||||||
|
|
||||||
# cscope files
|
# cscope files
|
||||||
cscope.*
|
cscope.*
|
||||||
|
|
10
.travis.yml
10
.travis.yml
|
@ -77,15 +77,15 @@ before_script:
|
||||||
fi
|
fi
|
||||||
|
|
||||||
script:
|
script:
|
||||||
## regression-tests/Makefile handles most of generic logic
|
## tests/Makefile handles most of generic logic
|
||||||
- "make -C regression-tests/??-$BUILD_TYPE RUNALL=true summary"
|
- "make -C tests/??-$BUILD_TYPE RUNALL=true summary"
|
||||||
|
|
||||||
after_script:
|
after_script:
|
||||||
## Print cooja test logs
|
## Print cooja test logs
|
||||||
- "[ ${BUILD_CATEGORY:-0} = sim ] && tail regression-tests/??-$BUILD_TYPE/*.testlog"
|
- "[ ${BUILD_CATEGORY:-0} = sim ] && tail tests/??-$BUILD_TYPE/*.testlog"
|
||||||
## Print a basic summary
|
## Print a basic summary
|
||||||
- "echo 'Summary:'; cat regression-tests/??-$BUILD_TYPE/summary"
|
- "echo 'Summary:'; cat tests/??-$BUILD_TYPE/summary"
|
||||||
- "FAILS=`grep -c ' FAIL ' regression-tests/??-$BUILD_TYPE/summary`"
|
- "FAILS=`grep -c ' FAIL ' tests/??-$BUILD_TYPE/summary`"
|
||||||
## This will detect whether the build should pass or fail
|
## This will detect whether the build should pass or fail
|
||||||
- "test $FAILS -eq 0; exit $?"
|
- "test $FAILS -eq 0; exit $?"
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@ RUNALL=false
|
||||||
endif
|
endif
|
||||||
|
|
||||||
%.testlog: %.csc cooja
|
%.testlog: %.csc cooja
|
||||||
@$(CONTIKI)/regression-tests/simexec.sh "$(RUNALL)" "$<" "$(CONTIKI)" "$(basename $@)" $(RANDOMSEED)
|
@$(CONTIKI)/tests/simexec.sh "$(RUNALL)" "$<" "$(CONTIKI)" "$(basename $@)" $(RANDOMSEED)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@rm -f $(TESTLOGS) $(LOGS) $(FAILLOGS) COOJA.log COOJA.testlog \
|
@rm -f $(TESTLOGS) $(LOGS) $(FAILLOGS) COOJA.log COOJA.testlog \
|
Loading…
Reference in New Issue