From 16fc096ad82effedd25c4127eb1d31c16f273dc3 Mon Sep 17 00:00:00 2001 From: noah Date: Tue, 20 Oct 2020 14:37:14 +0800 Subject: [PATCH] fix for cargo test sometimes fails when make runs with several simultaneous jobs --- ...-runs-with-several-simultaneous-jobs.patch | 27 +++++++++++++++++++ icedtea-web.spec | 8 +++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 fix-for-cargo-test-sometimes-fails-when-make-runs-with-several-simultaneous-jobs.patch diff --git a/fix-for-cargo-test-sometimes-fails-when-make-runs-with-several-simultaneous-jobs.patch b/fix-for-cargo-test-sometimes-fails-when-make-runs-with-several-simultaneous-jobs.patch new file mode 100644 index 0000000..271ea29 --- /dev/null +++ b/fix-for-cargo-test-sometimes-fails-when-make-runs-with-several-simultaneous-jobs.patch @@ -0,0 +1,27 @@ +From afc37ddad5bf09c6e8acd76242f471b491c62e9e Mon Sep 17 00:00:00 2001 +From: lherschi +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 ; \ diff --git a/icedtea-web.spec b/icedtea-web.spec index e400842..a4a8319 100644 --- a/icedtea-web.spec +++ b/icedtea-web.spec @@ -10,11 +10,14 @@ %global debug_package %{nil} Name: icedtea-web Version: 1.8.4 -Release: 2 +Release: 3 Summary: Additional Java components for OpenJDK - Java Web Start implementation License: LGPLv2+ and GPLv2 with exceptions URL: http://icedtea.classpath.org/wiki/IcedTea-Web Source0: http://github.com/AdoptOpenJDK/IcedTea-Web/archive/%{name}-%{version}.tar.gz + +Patch0006: fix-for-cargo-test-sometimes-fails-when-make-runs-with-several-simultaneous-jobs.patch + BuildRequires: javapackages-tools javapackages-local %{preffered_java}-devel BuildRequires: desktop-file-utils glib2-devel autoconf automake cargo junit hamcrest BuildRequires: libappstream-glib tagsoup git @@ -162,6 +165,9 @@ exit 0 %{_datadir}/man/man1/* %changelog +* Tue Oct 20 2020 noah - 1.8.4-3 +- add fix-for-cargo-test-sometimes-fails-when-make-runs-with-several-simultaneous-jobs.patch + * Sat Aug 29 2020 noah - 1.8.4-2 - Changed source url and description -- Gitee