Skip to content

Commit

Permalink
[macos] Test simple patch
Browse files Browse the repository at this point in the history
  • Loading branch information
ileanadumitrescu95 committed Oct 1, 2024
1 parent a03d38a commit 6ded701
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build-dev-tarball.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ git clone --depth 2 -b "$branch" https://git.savannah.gnu.org/git/"$package".git
git clone --depth 1 https://git.savannah.gnu.org/git/gnulib.git

# Apply patches.
# (cd "$package" && patch -p1 < ../patches/)
(cd "$package" && patch -p1 < ../patches/0001-tests-append-missing-PATH.patch)

export GNULIB_SRCDIR=`pwd`/gnulib
cd "$package"
Expand Down
1 change: 0 additions & 1 deletion build-on.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ case "$commit_message" in
;;
*)
# Run the tests.
export PATH="$PATH:/Library/Frameworks/Mono.framework/Versions/Current/Commands"
$make check TESTSUITEFLAGS="--debug 47 48 64 92 153-158" > log3 2>&1; rc=$?; cat log3; test $rc = 0 || exit 1
;;
esac
Expand Down
35 changes: 35 additions & 0 deletions patches/0001-tests-append-missing-PATH.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From 428fd67d60f6d67264d24dc927acef2370db405e Mon Sep 17 00:00:00 2001
From: Ileana Dumitrescu <ileanadumitrescu95@gmail.com>
Date: Tue, 1 Oct 2024 21:43:05 +0300
Subject: [PATCH] tests: append missing PATH

---
tests/f77demo.at | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/tests/f77demo.at b/tests/f77demo.at
index 6b96920a..e26251c4 100644
--- a/tests/f77demo.at
+++ b/tests/f77demo.at
@@ -292,6 +292,10 @@ AT_CHECK([$GREP 'Welcome to GNU libtool mixed C/Fortran demo!' stdout],

AT_SETUP([static library])

+save_PATH=$PATH
+PATH=$PATH:/Library/Frameworks/Mono.framework/Versions/Current/Commands
+export PATH
+
# Using clang with fsanitize results in an incompatible ASan runtime.
# It results in the warning message "linked against incompatible ASan
# runtimes". This only occurs with the mixed Fortran/C demo.
@@ -309,6 +313,7 @@ LT_AT_CHECK_CONFIG([--disable-shared],
[^build_old_libs=yes], [^build_libtool_libs=no])
_LT_CHECK_EXECUTE

+PATH=$save_PATH
AT_CLEANUP


--
2.45.2

0 comments on commit 6ded701

Please sign in to comment.