From patchwork Fri Dec 15 20:51:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 24973 Received: (qmail 62087 invoked by alias); 15 Dec 2017 20:51:48 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 61814 invoked by uid 89); 15 Dec 2017 20:51:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy= X-HELO: relay1.mentorg.com Date: Fri, 15 Dec 2017 20:51:41 +0000 From: Joseph Myers To: Subject: Fix testing with read-only source directory Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) Three tests fail with a read-only source directory because they try to write into the source directory. None of these write into it in a way that should actually be problematic for concurrent builds sharing the same writable source directory, but avoiding any writing into the source directory (from testing, or from building glibc if the source timestamps are properly ordered) is still a good idea, as being able to build with read-only sources helps make sure there isn't anything that could cause problems for concurrent builds. This patch changes the tests in question to use either /tmp or the build directory to write their temporary files (or to test O_TMPFILE, as applicable). Tested for x86_64. 2017-12-15 Joseph Myers * io/Makefile (tst-open-tmpfile-ARGS): New variable. * posix/tst-mmap-offset.c (fname): Use /tmp. * stdlib/tst-setcontext3.sh (tempfile): Use ${objpfx}. Reviewed-by: Jonathan Nieder diff --git a/io/Makefile b/io/Makefile index b3ee5ae..c725195 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 5bb88aa..5e940c8 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 158d0dc..014e7cf 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