diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2018-11-09 17:40:58 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2018-11-09 17:40:58 +0000 |
| commit | 91faaa93a5bb1da37f24c82269d830dcd7f2596f (patch) | |
| tree | 445b75797afb8a8cf239d9af14835db855f8501b | |
| parent | c3ec097256a1fad362bdc9cdaf56fddf3c621d10 (diff) | |
| download | glibc-91faaa93a5bb1da37f24c82269d830dcd7f2596f.tar.gz glibc-91faaa93a5bb1da37f24c82269d830dcd7f2596f.tar.xz glibc-91faaa93a5bb1da37f24c82269d830dcd7f2596f.zip | |
Update conform/Makefile mkdir commands.
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.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | conform/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 10872855b6..1153c53ec4 100644 --- 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. 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 \ |