aboutsummaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2022-04-11 15:45:35 -0400
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2022-04-12 01:28:41 +0200
commitd2263bf50af9aab84210c8c9bbf100bd780efad9 (patch)
treed54149e2b548898a7f532ad07dfe18414d8b9ff7 /support
parentac5f5a92edd9df5a6994e41309ef4a3580a2aeb1 (diff)
downloadglibc-d2263bf50af9aab84210c8c9bbf100bd780efad9.zip
glibc-d2263bf50af9aab84210c8c9bbf100bd780efad9.tar.gz
glibc-d2263bf50af9aab84210c8c9bbf100bd780efad9.tar.bz2
test-container: Fix "unused code" warnings on HURD
Comment out bits of code that are only used when we *have* pid namespaces, to avoid "unused code" warnings. Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Message-Id: <xno817tnds.fsf@greed.delorie.com>
Diffstat (limited to 'support')
-rw-r--r--support/test-container.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/support/test-container.c b/support/test-container.c
index c837c4d..7557aac 100644
--- a/support/test-container.c
+++ b/support/test-container.c
@@ -230,6 +230,7 @@ concat (const char *str, ...)
return bufs[n];
}
+#ifdef CLONE_NEWNS
/* Like the above, but put spaces between words. Caller frees. */
static char *
concat_words (char **words, int num_words)
@@ -255,6 +256,7 @@ concat_words (char **words, int num_words)
return rv;
}
+#endif
/* Try to mount SRC onto DEST. */
static void
@@ -756,7 +758,9 @@ main (int argc, char **argv)
/* If set, the test runs as root instead of the user running the testsuite. */
int be_su = 0;
int require_pidns = 0;
+#ifdef CLONE_NEWNS
const char *pidns_comment = NULL;
+#endif
int do_proc_mounts = 0;
int UMAP;
int GMAP;
@@ -1046,8 +1050,10 @@ main (int argc, char **argv)
else if (nt >= 1 && strcmp (the_words[0], "pidns") == 0)
{
require_pidns = 1;
+#ifdef CLONE_NEWNS
if (nt > 1)
pidns_comment = concat_words (the_words + 1, nt - 1);
+#endif
}
else if (nt == 3 && strcmp (the_words[0], "mkdirp") == 0)
{