28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From afc37ddad5bf09c6e8acd76242f471b491c62e9e Mon Sep 17 00:00:00 2001
|
|
From: lherschi <lhersch@dssgmbh.de>
|
|
Date: Sat, 25 Jul 2020 12:06:43 +0200
|
|
Subject: [PATCH] fix for cargo test sometimes fails when make runs with
|
|
several simultaneous jobs
|
|
|
|
---
|
|
Makefile.am | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index 3f73cff73..1112bf49f 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -956,10 +956,10 @@ if ENABLE_NATIVE_LAUNCHERS
|
|
# there is curently harecoded sh, so it can somehow basically work
|
|
# see the DESKTOP_SUFFIX for final tuning
|
|
launcher.build/$(javaws) launcher.build/$(itweb_settings) launcher.build/$(policyeditor): rust-launcher/src/main.rs rust-launcher/Cargo.toml
|
|
- export ITW_TMP_REPLACEMENT=$(TESTS_DIR)/rust_tests_tmp ; \
|
|
- mkdir -p $$ITW_TMP_REPLACEMENT; \
|
|
filename=`basename $@` ; \
|
|
type=$${filename%.*} ; \
|
|
+ export ITW_TMP_REPLACEMENT=$(TESTS_DIR)/rust_tests_tmp/$$type ; \
|
|
+ mkdir -p $$ITW_TMP_REPLACEMENT; \
|
|
srcs=$(TOP_SRC_DIR)/rust-launcher ; \
|
|
outs=$(TOP_BUILD_DIR)/launcher.in.$$type ; \
|
|
mkdir -p launcher.build ; \
|