projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extract common logic in OpenSSL-specific code
[tinc]
/
.ci
/
test
/
run.sh
diff --git
a/.ci/test/run.sh
b/.ci/test/run.sh
index
b17d2de
..
2d1eb07
100644
(file)
--- a/
.ci/test/run.sh
+++ b/
.ci/test/run.sh
@@
-32,12
+32,23
@@
run_tests() {
header "Running test flavor $flavor"
autoreconf -fsi
header "Running test flavor $flavor"
autoreconf -fsi
- # shellcheck disable=SC2046
- ./configure $(sh .ci/conf.sh "$@")
+
+ DISTCHECK_CONFIGURE_FLAGS=$(sh .ci/conf.sh "$@")
+ export DISTCHECK_CONFIGURE_FLAGS
+
+ # shellcheck disable=SC2086
+ ./configure $DISTCHECK_CONFIGURE_FLAGS
+
make -j"$(nproc)" all extra
make -j"$(nproc)" all extra
+ if [ "$(uname -s)" = Linux ]; then
+ cmd=distcheck
+ else
+ cmd=check
+ fi
+
code=0
code=0
- make
check
-j2 VERBOSE=1 || code=$?
+ make
$cmd
-j2 VERBOSE=1 || code=$?
sudo tar -c -z -f "/tmp/logs/tests.$flavor.tar.gz" test/ sanitizer/
sudo tar -c -z -f "/tmp/logs/tests.$flavor.tar.gz" test/ sanitizer/
@@
-75,6
+86,13
@@
nolegacy)
gcrypt)
run_tests gcrypt --with-libgcrypt
;;
gcrypt)
run_tests gcrypt --with-libgcrypt
;;
+openssl3)
+ if [ -d /opt/ssl3 ]; then
+ run_tests openssl3 --with-openssl=/opt/ssl3 --with-openssl-include=/opt/ssl3/include --with-openssl-lib=/opt/ssl3/lib64
+ else
+ echo >&2 "OpenSSL 3 not installed, skipping test"
+ fi
+ ;;
*)
bail "unknown test flavor $1"
;;
*)
bail "unknown test flavor $1"
;;