diff mbox series

Update conform/Makefile mkdir commands [committed]

Message ID alpine.DEB.2.21.1811091743090.6828@digraph.polyomino.org.uk
State New
Headers show
Series Update conform/Makefile mkdir commands [committed] | expand

Commit Message

Joseph Myers Nov. 9, 2018, 5:44 p.m. UTC 
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.  Committed.

2018-11-09  Joseph Myers  <joseph@codesourcery.com>

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

Patch

diff --git a/conform/Makefile b/conform/Makefile
index a428fbf937..5f9b480e79 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -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 \