implement Dbus setExpirationTimer (#735)

[signal-cli] / run_tests.sh

diff --git a/run_tests.sh b/run_tests.sh
index 4ee468455ef7b5820e5434fdff83692ef8e8253f..d306dfa9daa5b1f34641a19168cfe2b036532051 100755 (executable)
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -11,17 +11,22 @@ if [ ! -z "$GRAALVM_HOME" ]; then
   export JAVA_HOME=$GRAALVM_HOME
   export SIGNAL_CLI_OPTS='-agentlib:native-image-agent=config-merge-dir=graalvm-config-dir/'
 fi
-export SIGNAL_CLI="$PWD/build/install/signal-cli/bin/signal-cli"
 
 NUMBER_1="$1"
 NUMBER_2="$2"
 TEST_PIN_1=456test_pin_foo123
+NATIVE=1
 
 PATH_TEST_CONFIG="$PWD/build/test-config"
 PATH_MAIN="$PATH_TEST_CONFIG/main"
 PATH_LINK="$PATH_TEST_CONFIG/link"
 
-./gradlew installDist
+if [ "$NATIVE" -eq 1 ]; then
+       SIGNAL_CLI="$PWD/build/native/nativeCompile/signal-cli"
+else
+       ./gradlew installDist
+       SIGNAL_CLI="$PWD/build/install/signal-cli/bin/signal-cli"
+fi
 
 run() {
   set -x
@@ -136,8 +141,8 @@ run_main -u "$NUMBER_2" listGroups -d
 run_main -u "$NUMBER_2" --output=json listGroups -d
 run_main -u "$NUMBER_1" receive
 run_main -u "$NUMBER_1" updateGroup -g "$GROUP_ID" -m "$NUMBER_2"
-run_main -u "$NUMBER_1" block "$GROUP_ID"
-run_main -u "$NUMBER_1" unblock "$GROUP_ID"
+run_main -u "$NUMBER_1" --verbose block -g "$GROUP_ID"
+run_main -u "$NUMBER_1" --verbose unblock -g "$GROUP_ID"
 
 ## Identities
 run_main -u "$NUMBER_1" listIdentities