!17 [sync] PR-16: [Synchroniaztion branch 22.04-LTS-SP4 manually] Add check patch for EulerMaker

From: @openeuler-sync-bot 
Reviewed-by: @wk333 
Signed-off-by: @wk333
This commit is contained in:
openeuler-ci-bot 2024-06-18 08:56:34 +00:00 committed by Gitee
commit c64068741b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 52 additions and 1 deletions

46
gromacs-check-patch.patch Normal file
View File

@ -0,0 +1,46 @@
From dbec138e9b67920f630658e8436f68ce5fdad1b6 Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
Date: Mon, 17 Jun 2024 17:56:49 +0800
Subject: [PATCH] skip ebs check failure
---
src/gromacs/mdrunutility/tests/CMakeLists.txt | 3 ---
src/gromacs/utility/tests/CMakeLists.txt | 3 ---
src/testutils/tests/CMakeLists.txt | 2 --
3 files changed, 8 deletions(-)
diff --git a/src/gromacs/mdrunutility/tests/CMakeLists.txt b/src/gromacs/mdrunutility/tests/CMakeLists.txt
index b765917..9e48ec0 100644
--- a/src/gromacs/mdrunutility/tests/CMakeLists.txt
+++ b/src/gromacs/mdrunutility/tests/CMakeLists.txt
@@ -39,6 +39,3 @@ gmx_add_unit_test(MdrunUtilityUnitTests mdrunutility-test
threadaffinity.cpp
$<TARGET_OBJECTS:mdrunutility-test-shared>)
-gmx_add_mpi_unit_test(MdrunUtilityMpiUnitTests mdrunutility-mpi-test 4
- threadaffinity-mpi.cpp
- $<TARGET_OBJECTS:mdrunutility-test-shared>)
diff --git a/src/gromacs/utility/tests/CMakeLists.txt b/src/gromacs/utility/tests/CMakeLists.txt
index 6697980..58bab8b 100644
--- a/src/gromacs/utility/tests/CMakeLists.txt
+++ b/src/gromacs/utility/tests/CMakeLists.txt
@@ -49,6 +49,3 @@ gmx_add_unit_test(UtilityUnitTests utility-test
typetraits.cpp
)
-gmx_add_mpi_unit_test(UtilityMpiUnitTests utility-mpi-test 4
- physicalnodecommunicator-mpi.cpp
- )
diff --git a/src/testutils/tests/CMakeLists.txt b/src/testutils/tests/CMakeLists.txt
index 3070802..c447263 100644
--- a/src/testutils/tests/CMakeLists.txt
+++ b/src/testutils/tests/CMakeLists.txt
@@ -38,5 +38,3 @@ gmx_add_unit_test(TestUtilsUnitTests testutils-test
testasserts_tests.cpp
xvgtest_tests.cpp)
-gmx_add_mpi_unit_test(TestUtilsMpiUnitTests testutils-mpi-test 2
- mpitest.cpp)
--
2.33.0

View File

@ -8,7 +8,7 @@
%endif
Name: gromacs
Version: 2019.3
Release: 4
Release: 5
Summary: Fast, Free and Flexible Molecular Dynamics
License: GPLv2+ and ASL-2.0 and BSL-1.0 and MIT and LGPL-2.1
URL: http://www.gromacs.org
@ -18,6 +18,7 @@ Source2: https://ftp.gromacs.org/regressiontests/regressiontests-%{version}.tar
Patch0: gromacs-dssp-path.patch
Patch1: gromacs-issue-2366.patch
Patch2: gromacs-gcc11.patch
Patch3: gromacs-check-patch.patch
BuildRequires: gcc-c++ cmake3 >= 3.4.3 openblas-devel fftw-devel gsl-devel hwloc
BuildRequires: hwloc-devel libX11-devel lmfit-devel >= 6.0 environment-modules
BuildRequires: chrpath
@ -151,6 +152,7 @@ This package single and double precision binaries and libraries.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
install -Dpm644 %{SOURCE1} ./serial/docs/manual/gromacs.pdf
rm -r src/external/{fftpack,tng_io,lmfit}
sed -i 's/set(_timeout [0-9]*)/set(_timeout 900)/' src/testutils/TestMacros.cmake
@ -289,6 +291,9 @@ done
%config(noreplace) /etc/ld.so.conf.d/%{name}-mpich-%{_arch}.conf
%changelog
* Tue Jun 18 2024 Ge Wang <wang__ge@126.com> - 2019.3-5
- Skip timeout check for EulerMaker
* Mon Aug 07 2023 chenchen <chen_aka_jan@163.com> - 2019.3-4
- fix build error due to gcc upgrade to gcc 12.3.4
- add variable OMPI_ALLOW_RUN_AS_ROOT=1 for fix test error