diff --git a/linux/nix/e2e.sh b/linux/nix/e2e.sh index 585712b..6a7a426 100755 --- a/linux/nix/e2e.sh +++ b/linux/nix/e2e.sh @@ -64,14 +64,22 @@ done GOCACHE="$(go env GOCACHE)" export GOCACHE +# shellcheck disable=SC2329 +run_flutter_test() { + export DBUS_SESSION_BUS_ADDRESS="${DBUS_SESSION_BUS_ADDRESS%%;*}" + flutter test "$@" -d linux +} +export -f run_flutter_test + status=0 for file in "${files[@]}"; do name="$(basename "$file" .dart)" mkdir -p "$work/$name/data" "$work/$name/cache" + XDG_DATA_HOME="$work/$name/data" XDG_CACHE_HOME="$work/$name/cache" \ dbus-run-session --config-file="$DBUS_SESSION_CONFIG" -- \ - flutter test "$file" -d linux \ + bash -c 'run_flutter_test "$@"' -- "$file" \ --dart-define="NEXUS_E2E_HOMESERVER=$homeserver" "${flutter_args[@]}" || status=$? done -exit "$status" +exit "$status" \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 27a602e..40c4b8c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1959,5 +1959,5 @@ packages: source: hosted version: "2.2.4" sdks: - dart: ">=3.13.3 <4.0.0" + dart: "3.13.3" flutter: "3.47.4"