From 55519b1855f7ad2c25328fced26136bc0a0777e6 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Sat, 18 Aug 2018 17:34:49 +0300 Subject: [PATCH] scripts/test.sh: avoid conlfict with vanila cargo I am not sure why, but cargo does not like it if flatpak-builder and gnome Builder try to use the same target/ directory, even though the environment should be almost identical. The only difference is that Builder uses flatpak build instead of flatpak-builder as far as I can see. --- scripts/test.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/test.sh b/scripts/test.sh index 8084806..d337fdf 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -14,7 +14,10 @@ flatpak-builder --run app ${MANIFEST_PATH} glib-compile-resources --sourcedir=po # Build the flatpak repo flatpak-builder --run app ${MANIFEST_PATH} meson --prefix=/app build -flatpak-builder --run app ${MANIFEST_PATH} ninja -C build install +flatpak-builder --run \ + --env=CARGO_TARGET_DIR="target_build/" \ + app ${MANIFEST_PATH} \ + ninja -C build install # Run the tests xvfb-run -a -s "-screen 0 1024x768x24" \