<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-legacy-support.
</pre>
<p><a href="https://github.com/macports/macports-legacy-support/commit/3e60c321a69b31882ac760b96c72be71fc6ee7bf">https://github.com/macports/macports-legacy-support/commit/3e60c321a69b31882ac760b96c72be71fc6ee7bf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3e60c321a69b31882ac760b96c72be71fc6ee7bf
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Sun Apr 6 12:40:54 2025 -0700
<span style='display:block; white-space:pre;color:#404040;'> Make security-wrapper tests manual.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Since the st?chk security-wrapper tests need to deliberately use
</span><span style='display:block; white-space:pre;color:#404040;'> illegal C code to test the checks, and since some compilers generate
</span><span style='display:block; white-space:pre;color:#404040;'> unsuppressible warnings or even errors in such cases, we move them to
</span><span style='display:block; white-space:pre;color:#404040;'> the manual category to avoid polluting the normal test suite.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Tests now run under their mantest names.
</span>---
Makefile | 16 ++++++++--------
test/test_stpncpy_chk.c => manual_tests/stpncpy_chk.c | 0
manual_tests/stpncpy_chk_force0.c | 7 +++++++
manual_tests/stpncpy_chk_force1.c | 7 +++++++
.../stpncpy_chk_forced.c | 4 ++--
test/test_strncpy_chk.c => manual_tests/strncpy_chk.c | 0
manual_tests/strncpy_chk_force0.c | 7 +++++++
manual_tests/strncpy_chk_force1.c | 7 +++++++
.../strncpy_chk_forced.c | 4 ++--
test/test_stpncpy_chk_force0.c | 7 -------
test/test_stpncpy_chk_force1.c | 7 -------
test/test_strncpy_chk_force0.c | 7 -------
test/test_strncpy_chk_force1.c | 7 -------
13 files changed, 40 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/Makefile b/Makefile
</span><span style='display:block; white-space:pre;color:#808080;'>index e898ca4..4d733ea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/Makefile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/Makefile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,12 +184,6 @@ FDOPENDIRRUNS := $(patsubst \
</span> STATXXSRCS_C := $(wildcard $(TESTNAMEPREFIX)stat*.c)
STATXXRUNS := $(patsubst \
$(TESTNAMEPREFIX)%.c,$(TESTRUNPREFIX)%,$(STATXXSRCS_C))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-STPNCHKSRCS_C := $(wildcard $(TESTNAMEPREFIX)stpncpy_chk*.c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-STPNCHKRUNS := $(patsubst \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(TESTNAMEPREFIX)%.c,$(TESTRUNPREFIX)%,$(STPNCHKSRCS_C))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-STRNCHKSRCS_C := $(wildcard $(TESTNAMEPREFIX)strncpy_chk*.c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-STRNCHKRUNS := $(patsubst \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(TESTNAMEPREFIX)%.c,$(TESTRUNPREFIX)%,$(STRNCHKSRCS_C))
</span> PACKETSRCS_C := $(wildcard $(TESTNAMEPREFIX)packet*.c)
PACKETRUNS := $(patsubst \
$(TESTNAMEPREFIX)%.c,$(TESTRUNPREFIX)%,$(PACKETSRCS_C))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -215,6 +209,12 @@ MANTESTRUNS := $(patsubst \
</span> $(MANTESTPREFIX)%,$(MANRUNPREFIX)%,$(MANTESTPRGS))
MANLIBTESTRUNS := $(patsubst \
$(MANLIBTESTPFX)%,$(MANRUNPREFIX)%,$(MANLIBTESTPRGS_C))
<span style='display:block; white-space:pre;background:#e0ffe0;'>+STPNCHKSRCS_C := $(wildcard $(MANTESTPREFIX)stpncpy_chk*.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+STPNCHKRUNS := $(patsubst \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MANTESTPREFIX)%.c,$(MANRUNPREFIX)%,$(STPNCHKSRCS_C))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+STRNCHKSRCS_C := $(wildcard $(MANTESTPREFIX)strncpy_chk*.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+STRNCHKRUNS := $(patsubst \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MANTESTPREFIX)%.c,$(MANRUNPREFIX)%,$(STRNCHKSRCS_C))
</span>
TIGERSRCDIR = tiger_only/src
TIGERSRCS := $(wildcard $(TIGERSRCDIR)/*.c)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -438,10 +438,10 @@ $(TESTRUNPREFIX)fdopendir_all: $(FDOPENDIRRUNS)
</span> $(TESTRUNPREFIX)stat_all: $(STATXXRUNS)
# Provide a target for all "stpncpy_chk" tests
<span style='display:block; white-space:pre;background:#ffe0e0;'>-$(TESTRUNPREFIX)stpncpy_chk_all: $(STPNCHKRUNS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$(MANRUNPREFIX)stpncpy_chk_all: $(STPNCHKRUNS)
</span>
# Provide a target for all "strncpy_chk" tests
<span style='display:block; white-space:pre;background:#ffe0e0;'>-$(TESTRUNPREFIX)strncpy_chk_all: $(STRNCHKRUNS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$(MANRUNPREFIX)strncpy_chk_all: $(STRNCHKRUNS)
</span>
# Provide a target for all non-manual "packet" tests
$(TESTRUNPREFIX)packet_all: $(PACKETRUNS)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/test/test_stpncpy_chk.c b/manual_tests/stpncpy_chk.c
</span>similarity index 100%
rename from test/test_stpncpy_chk.c
rename to manual_tests/stpncpy_chk.c
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/manual_tests/stpncpy_chk_force0.c b/manual_tests/stpncpy_chk_force0.c
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2451bc7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/manual_tests/stpncpy_chk_force0.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Version of stpncpy_chk with enable forced to 0 (to disable checks).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define _FORTIFY_SOURCE 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include "stpncpy_chk.c"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/manual_tests/stpncpy_chk_force1.c b/manual_tests/stpncpy_chk_force1.c
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2ebd25e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/manual_tests/stpncpy_chk_force1.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Version of stpncpy_chk with enable forced to 1 (not the usual 2).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define _FORTIFY_SOURCE 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include "stpncpy_chk.c"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/test/test_stpncpy_chk_forced.c b/manual_tests/stpncpy_chk_forced.c
</span>similarity index 76%
rename from test/test_stpncpy_chk_forced.c
rename to manual_tests/stpncpy_chk_forced.c
<span style='display:block; white-space:pre;color:#808080;'>index ee95a05..e31e3ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/test/test_stpncpy_chk_forced.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/manual_tests/stpncpy_chk_forced.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> /*
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Version of test_stpncpy_chk with enable forced on.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Version of stpncpy_chk with enable forced on.
</span> *
* The security wrapper mechanism is unavailable on 10.4, available but
* defaulted off in 10.5, and enabled and defaulted on in 10.6+.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,4 +9,4 @@
</span>
#define _FORTIFY_SOURCE 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "test_stpncpy_chk.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include "stpncpy_chk.c"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/test/test_strncpy_chk.c b/manual_tests/strncpy_chk.c
</span>similarity index 100%
rename from test/test_strncpy_chk.c
rename to manual_tests/strncpy_chk.c
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/manual_tests/strncpy_chk_force0.c b/manual_tests/strncpy_chk_force0.c
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0b25764
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/manual_tests/strncpy_chk_force0.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Version of strncpy_chk with enable forced to 0 (to disable checks).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define _FORTIFY_SOURCE 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include "strncpy_chk.c"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/manual_tests/strncpy_chk_force1.c b/manual_tests/strncpy_chk_force1.c
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..cf890ed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/manual_tests/strncpy_chk_force1.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Version of strncpy_chk with enable forced to 1 (not the usual 2).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define _FORTIFY_SOURCE 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include "strncpy_chk.c"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/test/test_strncpy_chk_forced.c b/manual_tests/strncpy_chk_forced.c
</span>similarity index 76%
rename from test/test_strncpy_chk_forced.c
rename to manual_tests/strncpy_chk_forced.c
<span style='display:block; white-space:pre;color:#808080;'>index c37a108..d7f7061 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/test/test_strncpy_chk_forced.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/manual_tests/strncpy_chk_forced.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> /*
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Version of test_strncpy_chk with enable forced on.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Version of strncpy_chk with enable forced on.
</span> *
* The security wrapper mechanism is unavailable on 10.4, available but
* defaulted off in 10.5, and enabled and defaulted on in 10.6+.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,4 +9,4 @@
</span>
#define _FORTIFY_SOURCE 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "test_strncpy_chk.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include "strncpy_chk.c"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/test/test_stpncpy_chk_force0.c b/test/test_stpncpy_chk_force0.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e7a7f56..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/test/test_stpncpy_chk_force0.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Version of test_stpncpy_chk with enable forced to 0 (to disable checks).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define _FORTIFY_SOURCE 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "test_stpncpy_chk.c"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/test/test_stpncpy_chk_force1.c b/test/test_stpncpy_chk_force1.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b09ae0f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/test/test_stpncpy_chk_force1.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Version of test_stpncpy_chk with enable forced to 1 (not the usual 2).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define _FORTIFY_SOURCE 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "test_stpncpy_chk.c"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/test/test_strncpy_chk_force0.c b/test/test_strncpy_chk_force0.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c437478..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/test/test_strncpy_chk_force0.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Version of test_strncpy_chk with enable forced to 0 (to disable checks).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define _FORTIFY_SOURCE 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "test_strncpy_chk.c"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/test/test_strncpy_chk_force1.c b/test/test_strncpy_chk_force1.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f592ee0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/test/test_strncpy_chk_force1.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Version of test_strncpy_chk with enable forced to 1 (not the usual 2).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define _FORTIFY_SOURCE 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "test_strncpy_chk.c"
</span></pre><pre style='margin:0'>
</pre>