projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update the built-in Chacha20-Poly1305 code to an RFC 7539 complaint version.
[tinc]
/
.ci
/
test
/
run.sh
diff --git
a/.ci/test/run.sh
b/.ci/test/run.sh
index
fa23e24
..
89a5d37
100644
(file)
--- a/
.ci/test/run.sh
+++ b/
.ci/test/run.sh
@@
-24,24
+24,30
@@
run_tests() {
sudo pkill -KILL -x "$name" || true
done
sudo pkill -KILL -x "$name" || true
done
- sudo git clean -dfx
- sudo chown -R "${USER:-$(whoami)}" .
+ sudo chown -R "${USER:-$(whoami)}" . || true
mkdir -p sanitizer /tmp/logs
header "Running test flavor $flavor"
mkdir -p sanitizer /tmp/logs
header "Running test flavor $flavor"
- ./.ci/build.sh "$@"
+ ./.ci/build.sh "$
flavor" "$
@"
if [ "${HOST:-}" = mingw ]; then
echo >&2 "Integration tests cannot run under wine, skipping"
return 0
fi
if [ "${HOST:-}" = mingw ]; then
echo >&2 "Integration tests cannot run under wine, skipping"
return 0
fi
+ if [ -n "${HOST:-}" ]; then
+ echo >&2 "Using higher test timeout for cross-compilation job $HOST"
+ timeout=10
+ else
+ timeout=1
+ fi
+
code=0
code=0
- meson test -C
build
--verbose || code=$?
+ meson test -C
"$flavor" --timeout-multiplier $timeout
--verbose || code=$?
- sudo tar -c -z -f "/tmp/logs/tests.$flavor.tar.gz"
build/ sanitizer/
+ sudo tar -c -z -f "/tmp/logs/tests.$flavor.tar.gz"
"$flavor" sanitizer/ || true
return $code
}
return $code
}