]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Update conform/Makefile mkdir commands.
authorJoseph Myers <joseph@codesourcery.com>
Fri, 9 Nov 2018 17:40:58 +0000 (17:40 +0000)
committerJoseph Myers <joseph@codesourcery.com>
Fri, 9 Nov 2018 17:40:58 +0000 (17:40 +0000)
conform/Makefile creates $(@D)/scratch for the per-standard per-header
tests.  That directory was formerly used by the Perl scripts for
temporary files, but the Python implementations use
tempfile.TemporaryDirectory to get such files cleaned up
automatically.  This patch changes the Makefile to create only $(@D)
(required for the output redirection to work), not the scratch
subdirectory.

Tested for x86_64.

* conform/Makefile ($(conformtest-header-tests)): Create $(@D),
not $(@D)/scratch.
($(linknamespace-header-tests)): Likewise.

ChangeLog
conform/Makefile

index 10872855b6944301a834d32ee62bbc517689c7b3..1153c53ec4acf370ce7173ff558490287c56aa0a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2018-11-09  Joseph Myers  <joseph@codesourcery.com>
 
+       * conform/Makefile ($(conformtest-header-tests)): Create $(@D),
+       not $(@D)/scratch.
+       ($(linknamespace-header-tests)): Likewise.
+
        * conform/conformtest.py: New file.
        * conform/conformtest.pl: Remove.
        * conform/GlibcConform.pm: Likewise.
index a428fbf937c8ff682625b0a1b68670543c497f68..5f9b480e79dca60f86824cbfb3f109b74b7043fe 100644 (file)
@@ -174,7 +174,7 @@ endif
 $(conformtest-header-tests): $(objpfx)%/conform.out: \
                             conformtest.py $(conformtest-headers-data)
        (set -e; std_hdr=$*; std=$${std_hdr%%/*}; hdr=$${std_hdr#*/}; \
-        mkdir -p $(@D)/scratch; \
+        mkdir -p $(@D); \
         $(PYTHON) $< --cc='$(CC)' --flags='$(conformtest-cc-flags)' \
                   --standard=$$std --header=$$hdr $(conformtest-xfail) \
                   $(conformtest-cross) \
@@ -222,7 +222,7 @@ $(linknamespace-header-tests): $(objpfx)%/linknamespace.out: \
                               $(linknamespace-symlists-tests) \
                               $(linknamespace-symlist-stdlibs-tests)
        (set -e; std_hdr=$*; std=$${std_hdr%%/*}; hdr=$${std_hdr#*/}; \
-        mkdir -p $(@D)/scratch; \
+        mkdir -p $(@D); \
         $(PYTHON) $< --cc='$(CC)' --flags='$(conformtest-cc-flags)' \
                   --standard=$$std --stdsyms=$(objpfx)symlist-$$std \
                   --header=$$hdr --libsyms=$(objpfx)symlist-stdlibs-$$std \