!10 fix for cargo test sometimes fails when make runs with several simultaneous jobs

From: @jvmboy
Reviewed-by: @jdkboy
Signed-off-by: @jdkboy
This commit is contained in:
openeuler-ci-bot 2020-10-20 16:21:33 +08:00 committed by Gitee
commit a5ceb93520
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,27 @@
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 ; \

View File

@ -10,11 +10,14 @@
%global debug_package %{nil} %global debug_package %{nil}
Name: icedtea-web Name: icedtea-web
Version: 1.8.4 Version: 1.8.4
Release: 2 Release: 3
Summary: Additional Java components for OpenJDK - Java Web Start implementation Summary: Additional Java components for OpenJDK - Java Web Start implementation
License: LGPLv2+ and GPLv2 with exceptions License: LGPLv2+ and GPLv2 with exceptions
URL: http://icedtea.classpath.org/wiki/IcedTea-Web URL: http://icedtea.classpath.org/wiki/IcedTea-Web
Source0: http://github.com/AdoptOpenJDK/IcedTea-Web/archive/%{name}-%{version}.tar.gz 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: javapackages-tools javapackages-local %{preffered_java}-devel
BuildRequires: desktop-file-utils glib2-devel autoconf automake cargo junit hamcrest BuildRequires: desktop-file-utils glib2-devel autoconf automake cargo junit hamcrest
BuildRequires: libappstream-glib tagsoup git BuildRequires: libappstream-glib tagsoup git
@ -162,6 +165,9 @@ exit 0
%{_datadir}/man/man1/* %{_datadir}/man/man1/*
%changelog %changelog
* Tue Oct 20 2020 noah <hedongbo@huawei.com> - 1.8.4-3
- add fix-for-cargo-test-sometimes-fails-when-make-runs-with-several-simultaneous-jobs.patch
* Sat Aug 29 2020 noah <hedongbo@huawei.com> - 1.8.4-2 * Sat Aug 29 2020 noah <hedongbo@huawei.com> - 1.8.4-2
- Changed source url and description - Changed source url and description