Skip to content

Commit 742a6c7

Browse files
sjaeckelsjaeckel
committed
fix paths
1 parent b070672 commit 742a6c7

File tree

8 files changed

+38
-38
lines changed

8 files changed

+38
-38
lines changed

‎.ci/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fi
4545
4646
if [ -a testok.txt ] && [ -f testok.txt ]; then
4747
if [ "$LTC_COVERAGE" != "" ]; then
48-
./coverage_more.sh > test_coverage_more.txt || exit 1
48+
bash .ci/coverage_more.sh > test_coverage_more.txt || exit 1
4949
lcov_opts="--capture --no-external --directory src -q"
5050
lcov_out=$(echo coverage_$1_$2_$3 | tr ' -=+' '_')".info"
5151
lcov $lcov_opts --output-file $lcov_out

‎.ci/check_source.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# output version
4-
bash printinfo.sh
4+
bash .ci/printinfo.sh
55

66
make clean > /dev/null
77

‎.ci/coverage.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ if [ "$(echo $3 | grep -v 'makefile[.]')" == "" ]; then
2323
fi
2424

2525
# output version
26-
bash printinfo.sh
26+
bash .ci/printinfo.sh
2727

28-
bash build.sh " $1" " $2" " $3 COVERAGE=1" "$4" "$5"
28+
bash .ci/build.sh " $1" " $2" " $3 COVERAGE=1" "$4" "$5"
2929
if [ -a testok.txt ] && [ -f testok.txt ]; then
3030
echo
3131
else
@@ -34,7 +34,7 @@ else
3434
exit 1
3535
fi
3636

37-
./coverage_more.sh "$5" > test_coverage_more.txt || { rm -f testok.txt && exit 1 ; }
37+
bash .ci/coverage_more.sh "$5" > test_coverage_more.txt || { rm -f testok.txt && exit 1 ; }
3838

3939
make lcov-single
4040
# if this was executed as './coverage.sh ...' create coverage locally

‎.ci/meta_builds.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ else
2020
fi
2121

2222
function run_gcc() {
23-
bash check_source.sh "CHECK_SOURCES" "$2" "$3" "$4" "$5"
23+
bash .ci/check_source.sh "CHECK_SOURCES" "$2" "$3" "$4" "$5"
2424

2525
make clean &>/dev/null
2626

@@ -46,12 +46,12 @@ function run_gcc() {
4646
echo
4747
echo "Create code coverage"
4848

49-
bash coverage.sh "COVERAGE" "$2" "$3" "$4" "$5"
49+
bash .ci/coverage.sh "COVERAGE" "$2" "$3" "$4" "$5"
5050
}
5151

5252
function run_clang() {
5353
# output version
54-
bash printinfo.sh
54+
bash .ci/printinfo.sh
5555

5656
scan_build=$(which scan-build)
5757
[ -z "$scan_build" ] && scan_build=$(find /usr/bin/ -name 'scan-build-*' | sort -nr | head -n1) || true
@@ -90,8 +90,8 @@ fi
9090

9191
make clean &>/dev/null
9292

93-
bash testbuild.sh "NOTEST" "-DLTC_NO_TEST" "$3" "$4" "$5"
93+
bash .ci/testbuild.sh "NOTEST" "-DLTC_NO_TEST" "$3" "$4" "$5"
9494

9595
make clean &>/dev/null
9696

97-
bash testbuild.sh "NOFILE" "-DLTC_NO_FILE" "$3" "$4" "$5"
97+
bash .ci/testbuild.sh "NOFILE" "-DLTC_NO_FILE" "$3" "$4" "$5"

‎.ci/run.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22

33
# output version
4-
bash printinfo.sh
4+
bash .ci/printinfo.sh
55

6-
bash build.sh " $1" "$2 -O2" "$3 IGNORE_SPEED=1" "$4" "$5"
6+
bash .ci/build.sh " $1" "$2 -O2" "$3 IGNORE_SPEED=1" "$4" "$5"
77
if [ -a testok.txt ] && [ -f testok.txt ]; then
88
echo
99
else
@@ -13,7 +13,7 @@ else
1313
fi
1414

1515
rm -f testok.txt
16-
bash build.sh " $1" "$2 -Os" "$3 IGNORE_SPEED=1 LTC_SMALL=1" "$4" "$5"
16+
bash .ci/build.sh " $1" "$2 -Os" "$3 IGNORE_SPEED=1 LTC_SMALL=1" "$4" "$5"
1717
if [ -a testok.txt ] && [ -f testok.txt ]; then
1818
echo
1919
else
@@ -23,7 +23,7 @@ else
2323
fi
2424

2525
rm -f testok.txt
26-
bash build.sh " $1" "$2" "$3 LTC_DEBUG=1" "$4" "$5"
26+
bash .ci/build.sh " $1" "$2" "$3 LTC_DEBUG=1" "$4" "$5"
2727
if [ -a testok.txt ] && [ -f testok.txt ]; then
2828
echo
2929
else
@@ -33,7 +33,7 @@ else
3333
fi
3434

3535
rm -f testok.txt
36-
bash build.sh " $1" "$2" "$3" "$4" "$5"
36+
bash .ci/build.sh " $1" "$2" "$3" "$4" "$5"
3737
if [ -a testok.txt ] && [ -f testok.txt ]; then
3838
echo
3939
else

‎.ci/testbuild.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# output version
4-
bash printinfo.sh
4+
bash .ci/printinfo.sh
55

66
if [ -f /proc/cpuinfo ]
77
then

‎.ci/valgrind.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ else
1515
fi
1616

1717
# output version
18-
bash printinfo.sh
18+
bash .ci/printinfo.sh
1919

2020
make clean &>/dev/null
2121

‎testme.sh‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,59 +12,59 @@ fi
1212
echo "date="`date`
1313

1414
# check sources
15-
bash check_source.sh "CHECK_SOURCES" " " "$1" "$2" "$3" || exit 1
15+
bash .ci/check_source.sh "CHECK_SOURCES" " " "$1" "$2" "$3" || exit 1
1616

1717
mk="$1"
1818

1919
[ "$LTC_COVERAGE" != "" ] && mk="$mk COVERAGE=1"
2020

21+
# meta builds
22+
bash .ci/meta_builds.sh "META_BUILS" " " "$mk" "$2" "$3" || exit 1
23+
24+
# valgrind build
25+
bash .ci/valgrind.sh "VALGRIND" " " "$mk" "$2" "$3" || exit 1
26+
2127
# stock build
22-
bash run.sh "STOCK" " " "$mk" "$2" "$3" || exit 1
28+
bash .ci/run.sh "STOCK" " " "$mk" "$2" "$3" || exit 1
2329

2430
# EASY build
25-
bash run.sh "EASY" "-DLTC_EASY" "$mk" "$2" "$3" || exit 1
31+
bash .ci/run.sh "EASY" "-DLTC_EASY" "$mk" "$2" "$3" || exit 1
2632

2733
# SMALL code
28-
bash run.sh "SMALL" "-DLTC_SMALL_CODE" "$mk" "$2" "$3" || exit 1
34+
bash .ci/run.sh "SMALL" "-DLTC_SMALL_CODE" "$mk" "$2" "$3" || exit 1
2935

3036
# NOTABLES
31-
bash run.sh "NOTABLES" "-DLTC_NO_TABLES" "$mk" "$2" "$3" || exit 1
37+
bash .ci/run.sh "NOTABLES" "-DLTC_NO_TABLES" "$mk" "$2" "$3" || exit 1
3238

3339
# SMALL+NOTABLES
34-
bash run.sh "SMALL+NOTABLES" "-DLTC_SMALL_CODE -DLTC_NO_TABLES" "$mk" "$2" "$3" || exit 1
40+
bash .ci/run.sh "SMALL+NOTABLES" "-DLTC_SMALL_CODE -DLTC_NO_TABLES" "$mk" "$2" "$3" || exit 1
3541

3642
# CLEANSTACK
37-
bash run.sh "CLEANSTACK" "-DLTC_CLEAN_STACK" "$mk" "$2" "$3" || exit 1
43+
bash .ci/run.sh "CLEANSTACK" "-DLTC_CLEAN_STACK" "$mk" "$2" "$3" || exit 1
3844

3945
# CLEANSTACK + SMALL
40-
bash run.sh "CLEANSTACK+SMALL" "-DLTC_SMALL_CODE -DLTC_CLEAN_STACK" "$mk" "$2" "$3" || exit 1
46+
bash .ci/run.sh "CLEANSTACK+SMALL" "-DLTC_SMALL_CODE -DLTC_CLEAN_STACK" "$mk" "$2" "$3" || exit 1
4147

4248
# CLEANSTACK + NOTABLES
43-
bash run.sh "CLEANSTACK+NOTABLES" "-DLTC_NO_TABLES -DLTC_CLEAN_STACK" "$mk" "$2" "$3" || exit 1
49+
bash .ci/run.sh "CLEANSTACK+NOTABLES" "-DLTC_NO_TABLES -DLTC_CLEAN_STACK" "$mk" "$2" "$3" || exit 1
4450

4551
# CLEANSTACK + NOTABLES + SMALL
46-
bash run.sh "CLEANSTACK+NOTABLES+SMALL" "-DLTC_NO_TABLES -DLTC_CLEAN_STACK -DLTC_SMALL_CODE" "$mk" "$2" "$3" || exit 1
52+
bash .ci/run.sh "CLEANSTACK+NOTABLES+SMALL" "-DLTC_NO_TABLES -DLTC_CLEAN_STACK -DLTC_SMALL_CODE" "$mk" "$2" "$3" || exit 1
4753

4854
# NO_FAST
49-
bash run.sh "NO_FAST" "-DLTC_NO_FAST" "$mk" "$2" "$3" || exit 1
55+
bash .ci/run.sh "NO_FAST" "-DLTC_NO_FAST" "$mk" "$2" "$3" || exit 1
5056

5157
# NO_FAST + NOTABLES
52-
bash run.sh "NO_FAST+NOTABLES" "-DLTC_NO_FAST -DLTC_NO_TABLES" "$mk" "$2" "$3" || exit 1
58+
bash .ci/run.sh "NO_FAST+NOTABLES" "-DLTC_NO_FAST -DLTC_NO_TABLES" "$mk" "$2" "$3" || exit 1
5359

5460
# NO_ASM
55-
bash run.sh "NO_ASM" "-DLTC_NO_ASM" "$mk" "$2" "$3" || exit 1
61+
bash .ci/run.sh "NO_ASM" "-DLTC_NO_ASM" "$mk" "$2" "$3" || exit 1
5662

5763
# NO_TIMING_RESISTANCE
58-
bash run.sh "NO_TIMING_RESISTANCE" "-DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING" "$mk" "$2" "$3" || exit 1
64+
bash .ci/run.sh "NO_TIMING_RESISTANCE" "-DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING" "$mk" "$2" "$3" || exit 1
5965

6066
# CLEANSTACK+NOTABLES+SMALL+NO_ASM+NO_TIMING_RESISTANCE
61-
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
62-
63-
# test build with no testing
64-
bash testbuild.sh "NOTEST" "-DLTC_NO_TEST" "$mk" "$2" "$3" || exit 1
65-
66-
# test build with no file routines
67-
bash testbuild.sh "NOFILE" "-DLTC_NO_FILE" "$mk" "$2" "$3" || exit 1
67+
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
6868

6969
# ref: $Format:%D$
7070
# git commit: $Format:%H$

0 commit comments

Comments
 (0)