Update native-image handling in tests

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index b2e12b5e7850dc320f18ce81b4d6b00d1f1c0495..f9fe367f05a5a48d8f6dda84b110dd687de03af4 100644 (file)
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2960,6 +2960,15 @@
     {"name":"unidentifiedStatus_"}
   ]
 },
     {"name":"unidentifiedStatus_"}
   ]
 },

+{
+  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent$StoryMessageRecipient",
+  "fields":[
+    {"name":"bitField0_"}, 
+    {"name":"destinationUuid_"}, 
+    {"name":"distributionListIds_"}, 
+    {"name":"isAllowedToReply_"}
+  ]
+},

 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent$UnidentifiedDeliveryStatus",
   "fields":[
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent$UnidentifiedDeliveryStatus",
   "fields":[

diff --git a/run_tests.sh b/run_tests.sh
index aa185c9d7971dc3660b3e687ec1e942b3c0ec499..94eb98d9231eb9820c3cf39d47df1ee6674d23af 100755 (executable)
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -5,12 +5,6 @@ if [ $# -ne 2 ]; then
 fi
 
 set -e
 fi
 
 set -e

-# To update graalvm config, set GRAALVM_HOME, e.g:
-# export GRAALVM_HOME=/usr/lib/jvm/java-17-graalvm
-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

 
 NUMBER_1="$1"
 NUMBER_2="$2"
 
 NUMBER_1="$1"
 NUMBER_2="$2"


@@ -36,6 +30,13 @@ else
 fi
 
 run() {
 fi
 
 run() {

+  # To update graalvm config, set GRAALVM_HOME, e.g:
+  # export GRAALVM_HOME=/usr/lib/jvm/java-17-graalvm
+  if [ ! -z "$GRAALVM_HOME" ]; then
+    export JAVA_HOME=$GRAALVM_HOME
+    export SIGNAL_CLI_OPTS="-agentlib:native-image-agent=config-merge-dir=graalvm-config-dir-${SIGNAL_CLI_AGENT_ID}/"
+  fi
+

   set -x
   if [ "$JSON_RPC" -eq 1 ]; then
     "$SIGNAL_CLI" $@
   set -x
   if [ "$JSON_RPC" -eq 1 ]; then
     "$SIGNAL_CLI" $@


@@ -46,19 +47,23 @@ run() {
 }
 
 run_main() {
 }
 
 run_main() {

+  export SIGNAL_CLI_AGENT_ID=main

   if [ "$JSON_RPC" -eq 1 ]; then
     run --json-rpc-socket="$XDG_RUNTIME_DIR/signal-cli/socket" $@
   else
     run --config="$PATH_MAIN" $@
   fi
   if [ "$JSON_RPC" -eq 1 ]; then
     run --json-rpc-socket="$XDG_RUNTIME_DIR/signal-cli/socket" $@
   else
     run --config="$PATH_MAIN" $@
   fi

+  unset SIGNAL_CLI_AGENT_ID

 }
 
 run_linked() {
 }
 
 run_linked() {

+  export SIGNAL_CLI_AGENT_ID=linked

   if [ "$JSON_RPC" -eq 1 ]; then
     run --json-rpc-tcp="127.0.0.1:7583" $@
   else
     run --config="$PATH_LINK" $@
   fi
   if [ "$JSON_RPC" -eq 1 ]; then
     run --json-rpc-tcp="127.0.0.1:7583" $@
   else
     run --config="$PATH_LINK" $@
   fi

+  unset SIGNAL_CLI_AGENT_ID

 }
 
 register() {
 }
 
 register() {


@@ -227,3 +232,8 @@ run_main -a "$NUMBER_1" removeDevice -d 2
 ## Unregister
 run_main -a "$NUMBER_1" unregister
 run_main -a "$NUMBER_2" unregister --delete-account
 ## Unregister
 run_main -a "$NUMBER_1" unregister
 run_main -a "$NUMBER_2" unregister --delete-account

+
+if [ ! -z "$GRAALVM_HOME" ]; then
+  "$GRAALVM_HOME"/lib/svm/bin/native-image-configure generate --input-dir=graalvm-config-dir/ --input-dir=graalvm-config-dir-linked/ --input-dir=graalvm-config-dir-main/ --output-dir=graalvm-config-dir//
+  rm -r graalvm-config-dir-main graalvm-config-dir-linked
+fi