rpms/environment-modules
5
0
Fork 0
Code Issues Pull Requests Releases Activity

fix intermittent test failures

Browse Source 
Resolves: RHEL-62847
This commit is contained in:
Lukáš Zaoral 2024-10-29 14:00:24 +01:00
parent a39cc172bc
commit 5c2ba442e7
No known key found for this signature in database
GPG Key ID: 39157506DD67752D
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
environment-modules-5.3.1-fix-intermittent-test-failures.patch Normal file
View File

@ -0,0 +1,26 @@
From 8c757d59c068d7c41e78f59f575eca9d58785a36 Mon Sep 17 00:00:00 2001
From: Xavier Delaruelle <xavier.delaruelle@cea.fr>
Date: Mon, 28 Oct 2024 06:16:20 +0100
Subject: [PATCH] ts: fix 70/410 when no stdin and re chars in path
Fixes #552
Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
Upstream-commit: 8c757d59c068d7c41e78f59f575eca9d58785a36
---
testsuite/modules.70-maint/410-timer.exp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testsuite/modules.70-maint/410-timer.exp b/testsuite/modules.70-maint/410-timer.exp
index fe1dd0ffb..14ba2d2b1 100644
--- a/testsuite/modules.70-maint/410-timer.exp
+++ b/testsuite/modules.70-maint/410-timer.exp
@@ -77,7 +77,7 @@ testouterr_cmd_re sh {list --timer --silent} OK $tserr
# debug
set tserr "($timer_msgs .* \\\(\\d+.\\d+ ms\\\))*
-[msg_load foo/1.0 "Evaluate modulefile: '$mpre/foo/1.0' as 'foo/1.0'"]
+[escre [msg_load foo/1.0 "Evaluate modulefile: '$mp/foo/1.0' as 'foo/1.0'"]]
($timer_msgs .* \\\(\\d+.\\d+ ms\\\))*

9
environment-modules.spec
View File

@ -3,7 +3,7 @@
Name: environment-modules
Version: 5.3.1
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Provides dynamic modification of a user's environment
License: GPL-2.0-or-later
@ -14,6 +14,10 @@ Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.
# https://github.com/cea-hpc/modules/commit/a124745566804f8987a2c68944d395be10591f8c
Patch0: environment-modules-5.3.1-fix-source-sh-test.patch
# fix intermittent test failures (RHEL-62847)
# https://github.com/cea-hpc/modules/commit/8c757d59c068d7c41e78f59f575eca9d58785a36
Patch1: environment-modules-5.3.1-fix-intermittent-test-failures.patch
BuildRequires: tcl
BuildRequires: dejagnu
BuildRequires: make
@ -191,6 +195,9 @@ fi
%changelog
* Tue Oct 29 2024 Lukáš Zaoral <lzaoral@redhat.com> - 5.3.1-7
- fix intermittent test failures (RHEL-62847)
* Wed Oct 16 2024 Lukáš Zaoral <lzaoral@redhat.com> - 5.3.1-6
- fix source-sh test with non-default manpath (RHEL-62847)