From 742a6c7a3361eba55f156fedce7adcf91a6a209f Mon Sep 17 00:00:00 2001 From: Steffen Jaeckel Date: Wed, 18 Oct 2017 22:45:11 +0200 Subject: [PATCH] fix paths --- .ci/build.sh | 2 +- .ci/check_source.sh | 2 +- .ci/coverage.sh | 6 +++--- .ci/meta_builds.sh | 10 +++++----- .ci/run.sh | 10 +++++----- .ci/testbuild.sh | 2 +- .ci/valgrind.sh | 2 +- testme.sh | 42 +++++++++++++++++++++--------------------- 8 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.ci/build.sh b/.ci/build.sh index 62d09c5d..fa356946 100755 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -45,7 +45,7 @@ fi if [ -a testok.txt ] && [ -f testok.txt ]; then if [ "$LTC_COVERAGE" != "" ]; then - ./coverage_more.sh > test_coverage_more.txt || exit 1 + bash .ci/coverage_more.sh > test_coverage_more.txt || exit 1 lcov_opts="--capture --no-external --directory src -q" lcov_out=$(echo coverage_$1_$2_$3 | tr ' -=+' '_')".info" lcov $lcov_opts --output-file $lcov_out diff --git a/.ci/check_source.sh b/.ci/check_source.sh index 731377bb..1e04546d 100755 --- a/.ci/check_source.sh +++ b/.ci/check_source.sh @@ -1,7 +1,7 @@ #!/bin/bash # output version -bash printinfo.sh +bash .ci/printinfo.sh make clean > /dev/null diff --git a/.ci/coverage.sh b/.ci/coverage.sh index 44b60b50..3fc563d4 100755 --- a/.ci/coverage.sh +++ b/.ci/coverage.sh @@ -23,9 +23,9 @@ if [ "$(echo $3 | grep -v 'makefile[.]')" == "" ]; then fi # output version -bash printinfo.sh +bash .ci/printinfo.sh -bash build.sh " $1" " $2" " $3 COVERAGE=1" "$4" "$5" +bash .ci/build.sh " $1" " $2" " $3 COVERAGE=1" "$4" "$5" if [ -a testok.txt ] && [ -f testok.txt ]; then echo else @@ -34,7 +34,7 @@ else exit 1 fi -./coverage_more.sh "$5" > test_coverage_more.txt || { rm -f testok.txt && exit 1 ; } +bash .ci/coverage_more.sh "$5" > test_coverage_more.txt || { rm -f testok.txt && exit 1 ; } make lcov-single # if this was executed as './coverage.sh ...' create coverage locally diff --git a/.ci/meta_builds.sh b/.ci/meta_builds.sh index 473e29e8..eaf90294 100755 --- a/.ci/meta_builds.sh +++ b/.ci/meta_builds.sh @@ -20,7 +20,7 @@ else fi function run_gcc() { - bash check_source.sh "CHECK_SOURCES" "$2" "$3" "$4" "$5" + bash .ci/check_source.sh "CHECK_SOURCES" "$2" "$3" "$4" "$5" make clean &>/dev/null @@ -46,12 +46,12 @@ function run_gcc() { echo echo "Create code coverage" - bash coverage.sh "COVERAGE" "$2" "$3" "$4" "$5" + bash .ci/coverage.sh "COVERAGE" "$2" "$3" "$4" "$5" } function run_clang() { # output version - bash printinfo.sh + bash .ci/printinfo.sh scan_build=$(which scan-build) [ -z "$scan_build" ] && scan_build=$(find /usr/bin/ -name 'scan-build-*' | sort -nr | head -n1) || true @@ -90,8 +90,8 @@ fi make clean &>/dev/null -bash testbuild.sh "NOTEST" "-DLTC_NO_TEST" "$3" "$4" "$5" +bash .ci/testbuild.sh "NOTEST" "-DLTC_NO_TEST" "$3" "$4" "$5" make clean &>/dev/null -bash testbuild.sh "NOFILE" "-DLTC_NO_FILE" "$3" "$4" "$5" +bash .ci/testbuild.sh "NOFILE" "-DLTC_NO_FILE" "$3" "$4" "$5" diff --git a/.ci/run.sh b/.ci/run.sh index 94043c71..224dbc26 100755 --- a/.ci/run.sh +++ b/.ci/run.sh @@ -1,9 +1,9 @@ #!/bin/bash # output version -bash printinfo.sh +bash .ci/printinfo.sh -bash build.sh " $1" "$2 -O2" "$3 IGNORE_SPEED=1" "$4" "$5" +bash .ci/build.sh " $1" "$2 -O2" "$3 IGNORE_SPEED=1" "$4" "$5" if [ -a testok.txt ] && [ -f testok.txt ]; then echo else @@ -13,7 +13,7 @@ else fi rm -f testok.txt -bash build.sh " $1" "$2 -Os" "$3 IGNORE_SPEED=1 LTC_SMALL=1" "$4" "$5" +bash .ci/build.sh " $1" "$2 -Os" "$3 IGNORE_SPEED=1 LTC_SMALL=1" "$4" "$5" if [ -a testok.txt ] && [ -f testok.txt ]; then echo else @@ -23,7 +23,7 @@ else fi rm -f testok.txt -bash build.sh " $1" "$2" "$3 LTC_DEBUG=1" "$4" "$5" +bash .ci/build.sh " $1" "$2" "$3 LTC_DEBUG=1" "$4" "$5" if [ -a testok.txt ] && [ -f testok.txt ]; then echo else @@ -33,7 +33,7 @@ else fi rm -f testok.txt -bash build.sh " $1" "$2" "$3" "$4" "$5" +bash .ci/build.sh " $1" "$2" "$3" "$4" "$5" if [ -a testok.txt ] && [ -f testok.txt ]; then echo else diff --git a/.ci/testbuild.sh b/.ci/testbuild.sh index 59d2356c..ae066222 100755 --- a/.ci/testbuild.sh +++ b/.ci/testbuild.sh @@ -1,7 +1,7 @@ #!/bin/bash # output version -bash printinfo.sh +bash .ci/printinfo.sh if [ -f /proc/cpuinfo ] then diff --git a/.ci/valgrind.sh b/.ci/valgrind.sh index db2bd397..0aa3425f 100755 --- a/.ci/valgrind.sh +++ b/.ci/valgrind.sh @@ -15,7 +15,7 @@ else fi # output version -bash printinfo.sh +bash .ci/printinfo.sh make clean &>/dev/null diff --git a/testme.sh b/testme.sh index 8f84971c..e497161f 100755 --- a/testme.sh +++ b/testme.sh @@ -12,59 +12,59 @@ fi echo "date="`date` # check sources -bash check_source.sh "CHECK_SOURCES" " " "$1" "$2" "$3" || exit 1 +bash .ci/check_source.sh "CHECK_SOURCES" " " "$1" "$2" "$3" || exit 1 mk="$1" [ "$LTC_COVERAGE" != "" ] && mk="$mk COVERAGE=1" +# meta builds +bash .ci/meta_builds.sh "META_BUILS" " " "$mk" "$2" "$3" || exit 1 + +# valgrind build +bash .ci/valgrind.sh "VALGRIND" " " "$mk" "$2" "$3" || exit 1 + # stock build -bash run.sh "STOCK" " " "$mk" "$2" "$3" || exit 1 +bash .ci/run.sh "STOCK" " " "$mk" "$2" "$3" || exit 1 # EASY build -bash run.sh "EASY" "-DLTC_EASY" "$mk" "$2" "$3" || exit 1 +bash .ci/run.sh "EASY" "-DLTC_EASY" "$mk" "$2" "$3" || exit 1 # SMALL code -bash run.sh "SMALL" "-DLTC_SMALL_CODE" "$mk" "$2" "$3" || exit 1 +bash .ci/run.sh "SMALL" "-DLTC_SMALL_CODE" "$mk" "$2" "$3" || exit 1 # NOTABLES -bash run.sh "NOTABLES" "-DLTC_NO_TABLES" "$mk" "$2" "$3" || exit 1 +bash .ci/run.sh "NOTABLES" "-DLTC_NO_TABLES" "$mk" "$2" "$3" || exit 1 # SMALL+NOTABLES -bash run.sh "SMALL+NOTABLES" "-DLTC_SMALL_CODE -DLTC_NO_TABLES" "$mk" "$2" "$3" || exit 1 +bash .ci/run.sh "SMALL+NOTABLES" "-DLTC_SMALL_CODE -DLTC_NO_TABLES" "$mk" "$2" "$3" || exit 1 # CLEANSTACK -bash run.sh "CLEANSTACK" "-DLTC_CLEAN_STACK" "$mk" "$2" "$3" || exit 1 +bash .ci/run.sh "CLEANSTACK" "-DLTC_CLEAN_STACK" "$mk" "$2" "$3" || exit 1 # CLEANSTACK + SMALL -bash run.sh "CLEANSTACK+SMALL" "-DLTC_SMALL_CODE -DLTC_CLEAN_STACK" "$mk" "$2" "$3" || exit 1 +bash .ci/run.sh "CLEANSTACK+SMALL" "-DLTC_SMALL_CODE -DLTC_CLEAN_STACK" "$mk" "$2" "$3" || exit 1 # CLEANSTACK + NOTABLES -bash run.sh "CLEANSTACK+NOTABLES" "-DLTC_NO_TABLES -DLTC_CLEAN_STACK" "$mk" "$2" "$3" || exit 1 +bash .ci/run.sh "CLEANSTACK+NOTABLES" "-DLTC_NO_TABLES -DLTC_CLEAN_STACK" "$mk" "$2" "$3" || exit 1 # CLEANSTACK + NOTABLES + SMALL -bash run.sh "CLEANSTACK+NOTABLES+SMALL" "-DLTC_NO_TABLES -DLTC_CLEAN_STACK -DLTC_SMALL_CODE" "$mk" "$2" "$3" || exit 1 +bash .ci/run.sh "CLEANSTACK+NOTABLES+SMALL" "-DLTC_NO_TABLES -DLTC_CLEAN_STACK -DLTC_SMALL_CODE" "$mk" "$2" "$3" || exit 1 # NO_FAST -bash run.sh "NO_FAST" "-DLTC_NO_FAST" "$mk" "$2" "$3" || exit 1 +bash .ci/run.sh "NO_FAST" "-DLTC_NO_FAST" "$mk" "$2" "$3" || exit 1 # NO_FAST + NOTABLES -bash run.sh "NO_FAST+NOTABLES" "-DLTC_NO_FAST -DLTC_NO_TABLES" "$mk" "$2" "$3" || exit 1 +bash .ci/run.sh "NO_FAST+NOTABLES" "-DLTC_NO_FAST -DLTC_NO_TABLES" "$mk" "$2" "$3" || exit 1 # NO_ASM -bash run.sh "NO_ASM" "-DLTC_NO_ASM" "$mk" "$2" "$3" || exit 1 +bash .ci/run.sh "NO_ASM" "-DLTC_NO_ASM" "$mk" "$2" "$3" || exit 1 # NO_TIMING_RESISTANCE -bash run.sh "NO_TIMING_RESISTANCE" "-DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING" "$mk" "$2" "$3" || exit 1 +bash .ci/run.sh "NO_TIMING_RESISTANCE" "-DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING" "$mk" "$2" "$3" || exit 1 # CLEANSTACK+NOTABLES+SMALL+NO_ASM+NO_TIMING_RESISTANCE -bash run.sh "CLEANSTACK+NOTABLES+SMALL+NO_ASM+NO_TIMING_RESISTANCE" "-DLTC_CLEAN_STACK -DLTC_NO_TABLES -DLTC_SMALL_CODE -DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING" "$mk" "$2" "$3" || exit 1 - -# test build with no testing -bash testbuild.sh "NOTEST" "-DLTC_NO_TEST" "$mk" "$2" "$3" || exit 1 - -# test build with no file routines -bash testbuild.sh "NOFILE" "-DLTC_NO_FILE" "$mk" "$2" "$3" || exit 1 +bash .ci/run.sh "CLEANSTACK+NOTABLES+SMALL+NO_ASM+NO_TIMING_RESISTANCE" "-DLTC_CLEAN_STACK -DLTC_NO_TABLES -DLTC_SMALL_CODE -DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING" "$mk" "$2" "$3" || exit 1 # ref: $Format:%D$ # git commit: $Format:%H$