summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--io/Makefile2
-rw-r--r--posix/tst-mmap-offset.c2
-rw-r--r--stdlib/tst-setcontext3.sh2
4 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e96b2b49e4..852043e521 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-12-15 Joseph Myers <joseph@codesourcery.com>
+
+ * io/Makefile (tst-open-tmpfile-ARGS): New variable.
+ * posix/tst-mmap-offset.c (fname): Use /tmp.
+ * stdlib/tst-setcontext3.sh (tempfile): Use ${objpfx}.
+
2017-12-15 Steve Ellcey <sellcey@cavium.com>
* nscd/dbg_log.c (dbg_log): Increase msg buffer size.
diff --git a/io/Makefile b/io/Makefile
index b3ee5ae647..c72519541f 100644
--- a/io/Makefile
+++ b/io/Makefile
@@ -109,6 +109,8 @@ test-stat2-ARGS = Makefile . $(objpfx)test-stat2
tst-statvfs-ARGS = $(objpfx)tst-statvfs tst-statvfs.c /tmp
+tst-open-tmpfile-ARGS = --test-dir=$(objpfx)
+
ifeq ($(run-built-tests),yes)
$(objpfx)ftwtest.out: ftwtest-sh $(objpfx)ftwtest
$(SHELL) $< $(common-objpfx) '$(test-program-cmd)' > $@; \
diff --git a/posix/tst-mmap-offset.c b/posix/tst-mmap-offset.c
index 5bb88aab10..5e940c8d95 100644
--- a/posix/tst-mmap-offset.c
+++ b/posix/tst-mmap-offset.c
@@ -29,7 +29,7 @@
static int fd;
static long int page_shift;
-static char fname[] = "tst-mmap-offset-XXXXXX";
+static char fname[] = "/tmp/tst-mmap-offset-XXXXXX";
static void
do_prepare (int argc, char **argv)
diff --git a/stdlib/tst-setcontext3.sh b/stdlib/tst-setcontext3.sh
index 158d0dc0a8..014e7cfc5b 100644
--- a/stdlib/tst-setcontext3.sh
+++ b/stdlib/tst-setcontext3.sh
@@ -34,7 +34,7 @@ cleanup() {
}
trap cleanup 0
-tempfile=$(mktemp "tst-setcontext3.XXXXXXXXXX")
+tempfile=$(mktemp "${objpfx}tst-setcontext3.XXXXXXXXXX")
# We want to run the test program and see if secontext called
# exit() and wrote out the test file we specified. If the