Add support for meson build system

[tinc] / test / compression.test

diff --git a/test/compression.test b/test/compression.test
index 77efd6d..ac92541 100755 (executable)
--- a/test/compression.test
+++ b/test/compression.test
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-. ./testlib.sh
+# shellcheck disable=SC1090
+. "$TESTLIB_PATH"
 
-test "$(id -u)" = "0" || exit $EXIT_SKIP_TEST
-test -e /dev/net/tun || exit $EXIT_SKIP_TEST
-ip netns list || exit $EXIT_SKIP_TEST
-command -v socat || exit $EXIT_SKIP_TEST
+require_root "$0" "$@"
+test -e /dev/net/tun || exit "$EXIT_SKIP_TEST"
+ip netns list || exit "$EXIT_SKIP_TEST"
+command -v socat || exit "$EXIT_SKIP_TEST"
 
 ip_foo=192.168.1.1
 ip_bar=192.168.1.2
@@ -106,11 +107,12 @@ for level in $levels; do
   wait_script foo hosts/bar-up
   wait_script bar hosts/foo-up
 
-  ip netns exec foo \
-    socat -u TCP4-LISTEN:$recv_port_foo,reuseaddr OPEN:"$tmp_file",creat &
-
-  ip netns exec bar \
-    socat -u OPEN:"$ref_file" TCP4:$ip_foo:$recv_port_foo,retry=30
+  sh <<EOF
+    set -eu
+    ip netns exec foo socat -u TCP4-LISTEN:$recv_port_foo,reuseaddr OPEN:"$tmp_file",creat &
+    ip netns exec bar socat -u OPEN:"$ref_file" TCP4:$ip_foo:$recv_port_foo,retry=30 &
+    wait
+EOF
 
   diff -w "$ref_file" "$tmp_file"
 
@@ -124,7 +126,7 @@ for level in $bogus_levels; do
   echo "[STEP] Testing bogus compression level $level"
   tinc foo set Compression "$level"
 
-  output=$(must_fail start_tinc foo 2>&1)
+  output=$(expect_code "$EXIT_FAILURE" start_tinc foo 2>&1)
 
   if ! echo "$output" | grep -q 'Bogus compression level'; then
     bail 'expected message about the wrong compression level'