msnfs41client: Patches for tests+misc, 2025-05-02
Posted by Anonymous on Fri 2nd May 2025 14:35
raw | new post

From c7aa3e0ab6b2d722b8e3e7a3ae538cdb51a2e61c Mon Sep 17 00:00:00 2001
From: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri, 2 May 2025 11:36:09 +0200
Subject: [PATCH 1/3] tests: nfsbuildtest gcc build should use
 --enable-serial-configure

nfsbuildtest gcc build should use --enable-serial-configure, it seems
that not all configure probes can or should be run in parallel.
gcc package maintainers use the same method to avoid random build
failures in configure.

Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
---
 tests/nfsbuildtest/nfsbuildtest.ksh93 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/nfsbuildtest/nfsbuildtest.ksh93 b/tests/nfsbuildtest/nfsbuildtest.ksh93
index c9e056a..8e4bb2a 100644
--- a/tests/nfsbuildtest/nfsbuildtest.ksh93
+++ b/tests/nfsbuildtest/nfsbuildtest.ksh93
@@ -117,6 +117,7 @@ function gcc_build
                # retry loop using delay that kills all performance
                # benefits..."
                '--disable-libstdcxx-pch'
+               '--enable-serial-configure'
        )

        #
--
2.45.1

From 7748217fd2bf37425128164bd14d896b9394526a Mon Sep 17 00:00:00 2001
From: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri, 2 May 2025 11:54:23 +0200
Subject: [PATCH 2/3] cygwin: multisparsefiletest.ksh should be installed
 in /usr/share/msnfs41client/tests/sparsefiles/

multisparsefiletest.ksh should be installed in
/usr/share/msnfs41client/tests/sparsefiles/

Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
---
 cygwin/Makefile.install | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cygwin/Makefile.install b/cygwin/Makefile.install
index dcd6f13..bd36c89 100644
--- a/cygwin/Makefile.install
+++ b/cygwin/Makefile.install
@@ -127,6 +127,7 @@ installdest:
        cp $(PROJECT_BASEDIR_DIR)/tests/nfsbuildtest/nfsbuildtest.ksh93 $(DESTDIR)/$(CYGWIN_BASEPATH)/usr/share/msnfs41client/tests/misc/nfsbuildtest.ksh93
        cp $(PROJECT_BASEDIR_DIR)/tests/sparsefiles/testsparsefile1.ksh $(DESTDIR)/$(CYGWIN_BASEPATH)/usr/share/msnfs41client/tests/sparsefiles/testsparsefile1.ksh
        cp $(PROJECT_BASEDIR_DIR)/tests/sparsefiles/testsparseexe1.ksh $(DESTDIR)/$(CYGWIN_BASEPATH)/usr/share/msnfs41client/tests/sparsefiles/testsparseexe1.ksh
+       cp $(PROJECT_BASEDIR_DIR)/tests/sparsefiles/multisparsefiletest.ksh $(DESTDIR)/$(CYGWIN_BASEPATH)/usr/share/msnfs41client/tests/sparsefiles/multisparsefiletest.ksh
        cp $(PROJECT_BASEDIR_DIR)/tests/fstest_make_numtree1/fstest_make_numtree1.ksh93 $(DESTDIR)/$(CYGWIN_BASEPATH)/usr/share/msnfs41client/tests/misc/fstest_make_numtree1.ksh93
        cp $(PROJECT_BASEDIR_DIR)/tests/wintartests/wintartest_comparewinvsgnu001.bash $(DESTDIR)/$(CYGWIN_BASEPATH)/usr/share/msnfs41client/tests/misc/wintartest_comparewinvsgnu001.bash
        cp $(PROJECT_BASEDIR_DIR)/tests/wintartests/wintartest_seq001.bash $(DESTDIR)/$(CYGWIN_BASEPATH)/usr/share/msnfs41client/tests/misc/wintartest_seq001.bash
--
2.45.1

From b0b9ccb3a001b2322749ea5b53083fab28eef568 Mon Sep 17 00:00:00 2001
From: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri, 2 May 2025 11:55:51 +0200
Subject: [PATCH 3/3] cygwin: Fix <TAB> in Makefile.install

Fix <TAB> in Makefile.install

Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
---
 cygwin/Makefile.install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cygwin/Makefile.install b/cygwin/Makefile.install
index bd36c89..bb39dcc 100644
--- a/cygwin/Makefile.install
+++ b/cygwin/Makefile.install
@@ -47,7 +47,7 @@ installdest:
        # on 32bit we just create a hardlink from nfs_mount.exe to nfs_mount.i686.exe
        if [[ "$(CYGWIN_BASEPATH)" == *64* ]] ; then \
                cp $(VS_BUILD_DIR32)/../Release/nfs_mount.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_mount.i686.exe ; \
-        else \
+       else \
                ln -f $(VS_BUILD_DIR32)/../Debug/nfs_mount.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_mount.i686.exe ; \
        fi
        ln -f $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_mount.i686.exe $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/nfs_umount.i686.exe
--
2.45.1