Browse Source

fix paths

Steffen Jaeckel 8 years ago
parent
commit
742a6c7a33
8 changed files with 38 additions and 38 deletions
  1. 1 1
      .ci/build.sh
  2. 1 1
      .ci/check_source.sh
  3. 3 3
      .ci/coverage.sh
  4. 5 5
      .ci/meta_builds.sh
  5. 5 5
      .ci/run.sh
  6. 1 1
      .ci/testbuild.sh
  7. 1 1
      .ci/valgrind.sh
  8. 21 21
      testme.sh

+ 1 - 1
.ci/build.sh

@@ -45,7 +45,7 @@ fi
 
 
 if [ -a testok.txt ] && [ -f testok.txt ]; then
 if [ -a testok.txt ] && [ -f testok.txt ]; then
    if [ "$LTC_COVERAGE" != "" ]; 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_opts="--capture --no-external --directory src -q"
       lcov_out=$(echo coverage_$1_$2_$3 | tr ' -=+' '_')".info"
       lcov_out=$(echo coverage_$1_$2_$3 | tr ' -=+' '_')".info"
       lcov $lcov_opts --output-file $lcov_out
       lcov $lcov_opts --output-file $lcov_out

+ 1 - 1
.ci/check_source.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 #!/bin/bash
 
 
 # output version
 # output version
-bash printinfo.sh
+bash .ci/printinfo.sh
 
 
 make clean > /dev/null
 make clean > /dev/null
 
 

+ 3 - 3
.ci/coverage.sh

@@ -23,9 +23,9 @@ if [ "$(echo $3 | grep -v 'makefile[.]')" == "" ]; then
 fi
 fi
 
 
 # output version
 # 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
 if [ -a testok.txt ] && [ -f testok.txt ]; then
    echo
    echo
 else
 else
@@ -34,7 +34,7 @@ else
    exit 1
    exit 1
 fi
 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
 make lcov-single
 # if this was executed as './coverage.sh ...' create coverage locally
 # if this was executed as './coverage.sh ...' create coverage locally

+ 5 - 5
.ci/meta_builds.sh

@@ -20,7 +20,7 @@ else
 fi
 fi
 
 
 function run_gcc() {
 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
    make clean &>/dev/null
 
 
@@ -46,12 +46,12 @@ function run_gcc() {
    echo
    echo
    echo "Create code coverage"
    echo "Create code coverage"
 
 
-   bash coverage.sh "COVERAGE" "$2" "$3" "$4" "$5"
+   bash .ci/coverage.sh "COVERAGE" "$2" "$3" "$4" "$5"
 }
 }
 
 
 function run_clang() {
 function run_clang() {
    # output version
    # output version
-   bash printinfo.sh
+   bash .ci/printinfo.sh
 
 
    scan_build=$(which scan-build)
    scan_build=$(which scan-build)
    [ -z "$scan_build" ] && scan_build=$(find /usr/bin/ -name 'scan-build-*' | sort -nr | head -n1) || true
    [ -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
 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
 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"

+ 5 - 5
.ci/run.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 #!/bin/bash
 
 
 # output version
 # 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
 if [ -a testok.txt ] && [ -f testok.txt ]; then
    echo
    echo
 else
 else
@@ -13,7 +13,7 @@ else
 fi
 fi
 
 
 rm -f testok.txt
 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
 if [ -a testok.txt ] && [ -f testok.txt ]; then
    echo
    echo
 else
 else
@@ -23,7 +23,7 @@ else
 fi
 fi
 
 
 rm -f testok.txt
 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
 if [ -a testok.txt ] && [ -f testok.txt ]; then
    echo
    echo
 else
 else
@@ -33,7 +33,7 @@ else
 fi
 fi
 
 
 rm -f testok.txt
 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
 if [ -a testok.txt ] && [ -f testok.txt ]; then
    echo
    echo
 else
 else

+ 1 - 1
.ci/testbuild.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 #!/bin/bash
 
 
 # output version
 # output version
-bash printinfo.sh
+bash .ci/printinfo.sh
 
 
 if [ -f /proc/cpuinfo ]
 if [ -f /proc/cpuinfo ]
 then
 then

+ 1 - 1
.ci/valgrind.sh

@@ -15,7 +15,7 @@ else
 fi
 fi
 
 
 # output version
 # output version
-bash printinfo.sh
+bash .ci/printinfo.sh
 
 
 make clean &>/dev/null
 make clean &>/dev/null
 
 

+ 21 - 21
testme.sh

@@ -12,59 +12,59 @@ fi
 echo "date="`date`
 echo "date="`date`
 
 
 # check sources
 # 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"
 mk="$1"
 
 
 [ "$LTC_COVERAGE" != "" ] && mk="$mk COVERAGE=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
 # stock build
-bash run.sh "STOCK" " " "$mk" "$2" "$3" || exit 1
+bash .ci/run.sh "STOCK" " " "$mk" "$2" "$3" || exit 1
 
 
 # EASY build
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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$
 # ref:         $Format:%D$
 # git commit:  $Format:%H$
 # git commit:  $Format:%H$