]> Savannah Git Hosting - gnulib/maint-tools.git/commitdiff
gnulib-tool-tests: Postprocess the output of the create-tests.
authorBruno Haible <bruno@clisp.org>
Sun, 24 Mar 2024 21:40:14 +0000 (22:40 +0100)
committerBruno Haible <bruno@clisp.org>
Sun, 24 Mar 2024 21:40:14 +0000 (22:40 +0100)
gnulib-tool-tests/create-tests/test-create-testdir-4.out
gnulib-tool-tests/init.sh

index 71784ef866a38e5dacff237fcec21a559258ab88..008ce3e021c0016e78cc957a666eaf880efa1b9e 100644 (file)
@@ -8681,8 +8681,6 @@ checking whether the compiler supports GNU C++... yes
 checking whether /home/bruno/inst-clang/17.0.4/bin/clang++ -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -L/usr/lib/gcc/x86_64-linux-gnu/11 -Wl,-rpath,/home/bruno/inst-clang/17.0.4/lib -fsanitize=address,undefined,signed-integer-overflow,shift,integer-divide-by-zero accepts -g... yes
 configure: autobuild project... dummy
 configure: autobuild revision... 0
-configure: autobuild hostname... nimes
-configure: autobuild timestamp... 20240319T164603Z
 checking for /home/bruno/inst-clang/17.0.4/bin/clang -Wl,-rpath,/home/bruno/inst-clang/17.0.4/lib -fsanitize=address,undefined,signed-integer-overflow,shift,integer-divide-by-zero option to enable large file support... none needed
 checking for /home/bruno/inst-clang/17.0.4/bin/clang -Wl,-rpath,/home/bruno/inst-clang/17.0.4/lib -fsanitize=address,undefined,signed-integer-overflow,shift,integer-divide-by-zero option for timestamps after 2038... none needed
 checking for /home/bruno/inst-clang/17.0.4/bin/clang -Wl,-rpath,/home/bruno/inst-clang/17.0.4/lib -fsanitize=address,undefined,signed-integer-overflow,shift,integer-divide-by-zero option to enable large file support... (cached) none needed
@@ -11489,7 +11487,7 @@ sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''NEXT_OMP_H''@|<omp.h>|g' \
       ./omp.in.h > omp.h-t
 mv omp.h-t omp.h
-make[1]: Entering directory '/media/develdata/devel/GNULIB/maint-tools/gnulib-tool-tests/create-tests/test-create-testdir-4.result/gllib'
+make[1]: Entering directory '//test-create-testdir-4.result/gllib'
 bison -d   ./parse-datetime.y \
 && test ':' = 'bison' || { \
   sed -e 's|".*/parse-datetime\.y"|"parse-datetime.y"|' \
@@ -11503,7 +11501,7 @@ bison -d   ./parse-datetime.y \
   && mv parse-datetime.c-tmp ./parse-datetime.c \
   && mv parse-datetime-gen.h-tmp ./parse-datetime-gen.h; \
 }
-make[1]: Leaving directory '/media/develdata/devel/GNULIB/maint-tools/gnulib-tool-tests/create-tests/test-create-testdir-4.result/gllib'
+make[1]: Leaving directory '//test-create-testdir-4.result/gllib'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_POLL_H''@|1|g' \
@@ -13274,8 +13272,8 @@ sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       ./wctype.in.h > wctype.h-t
 mv wctype.h-t wctype.h
 Making distclean in gllib
-make[1]: Entering directory '/media/develdata/devel/GNULIB/maint-tools/gnulib-tool-tests/create-tests/test-create-testdir-4.result/gllib'
-make[2]: Entering directory '/media/develdata/devel/GNULIB/maint-tools/gnulib-tool-tests/create-tests/test-create-testdir-4.result/gllib'
+make[1]: Entering directory '//test-create-testdir-4.result/gllib'
+make[2]: Entering directory '//test-create-testdir-4.result/gllib'
 test -z "git-merge-changelog" || rm -f git-merge-changelog
 test -z "configmake.h configmake.h-t" || rm -f configmake.h configmake.h-t
 test -z "libgnu.a" || rm -f libgnu.a
@@ -13335,7 +13333,7 @@ test -z "" || rm -f
 test '.' = . || rm -f ../GNUmakefile
 rm -f  ./.deps/asnprintf.Po ./.deps/asprintf.Po ./.deps/c32srtombs-state.Po ./.deps/dprintf.Po ./.deps/fopen.Po ./.deps/fprintf.Po ./.deps/mbsrtoc32s-state.Po ./.deps/mbsrtowcs-state.Po ./.deps/mktime.Po ./.deps/obstack_printf.Po ./.deps/printf.Po ./.deps/printf-args.Po ./.deps/printf-parse.Po ./.deps/snprintf.Po ./.deps/sprintf.Po ./.deps/strerror_r.Po ./.deps/vasnprintf.Po ./.deps/vasprintf.Po ./.deps/vdprintf.Po ./.deps/vfprintf.Po ./.deps/vprintf.Po ./.deps/vsnprintf.Po ./.deps/vsprintf.Po ./.deps/wcsstr.Po
 rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-make[2]: Leaving directory '/media/develdata/devel/GNULIB/maint-tools/gnulib-tool-tests/create-tests/test-create-testdir-4.result/gllib'
+make[2]: Leaving directory '//test-create-testdir-4.result/gllib'
 rm -f ./.deps/_Exit.Po
 rm -f ./.deps/accept.Po
 rm -f ./.deps/accept4.Po
@@ -14867,17 +14865,17 @@ rm -f uniwidth/.deps/u8-strwidth.Po
 rm -f uniwidth/.deps/u8-width.Po
 rm -f uniwidth/.deps/width.Po
 rm -f Makefile
-make[1]: Leaving directory '/media/develdata/devel/GNULIB/maint-tools/gnulib-tool-tests/create-tests/test-create-testdir-4.result/gllib'
+make[1]: Leaving directory '//test-create-testdir-4.result/gllib'
 Making distclean in glm4
-make[1]: Entering directory '/media/develdata/devel/GNULIB/maint-tools/gnulib-tool-tests/create-tests/test-create-testdir-4.result/glm4'
+make[1]: Entering directory '//test-create-testdir-4.result/glm4'
 test -z "" || rm -f 
 test . = "." || test -z "" || rm -f 
 rm -f Makefile
-make[1]: Leaving directory '/media/develdata/devel/GNULIB/maint-tools/gnulib-tool-tests/create-tests/test-create-testdir-4.result/glm4'
+make[1]: Leaving directory '//test-create-testdir-4.result/glm4'
 Making distclean in gltests
-make[1]: Entering directory '/media/develdata/devel/GNULIB/maint-tools/gnulib-tool-tests/create-tests/test-create-testdir-4.result/gltests'
+make[1]: Entering directory '//test-create-testdir-4.result/gltests'
 Making distclean in .
-make[2]: Entering directory '/media/develdata/devel/GNULIB/maint-tools/gnulib-tool-tests/create-tests/test-create-testdir-4.result/gltests'
+make[2]: Entering directory '//test-create-testdir-4.result/gltests'
 test -z "" || rm -f 
 rm -rf SunWS_cache
 test -z "libtests.a" || rm -f libtests.a
@@ -14928,7 +14926,7 @@ rm -f uniwidth/.deps/.dirstamp
 rm -f uniwidth/.dirstamp
 test -z "" || rm -f 
 rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-make[2]: Leaving directory '/media/develdata/devel/GNULIB/maint-tools/gnulib-tool-tests/create-tests/test-create-testdir-4.result/gltests'
+make[2]: Leaving directory '//test-create-testdir-4.result/gltests'
 rm -f ./.deps/bench_md5-bench-md5.Po
 rm -f ./.deps/bench_sha1-bench-sha1.Po
 rm -f ./.deps/bench_sha224-bench-sha224.Po
@@ -16400,14 +16398,14 @@ rm -f uniwidth/.deps/test-u8-width.Po
 rm -f uniwidth/.deps/test-uc_width.Po
 rm -f uniwidth/.deps/test-uc_width2.Po
 rm -f Makefile
-make[1]: Leaving directory '/media/develdata/devel/GNULIB/maint-tools/gnulib-tool-tests/create-tests/test-create-testdir-4.result/gltests'
-make[1]: Entering directory '/media/develdata/devel/GNULIB/maint-tools/gnulib-tool-tests/create-tests/test-create-testdir-4.result'
+make[1]: Leaving directory '//test-create-testdir-4.result/gltests'
+make[1]: Entering directory '//test-create-testdir-4.result'
 test -z "csharpcomp.sh csharpexec.sh javacomp.sh javaexec.sh ldd.sh" || rm -f csharpcomp.sh csharpexec.sh javacomp.sh javaexec.sh ldd.sh
 test . = "." || test -z "" || rm -f 
 rm -f config.h stamp-h1
 rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-make[1]: Leaving directory '/media/develdata/devel/GNULIB/maint-tools/gnulib-tool-tests/create-tests/test-create-testdir-4.result'
+make[1]: Leaving directory '//test-create-testdir-4.result'
 rm -f config.status config.cache config.log configure.lineno config.status.lineno
 rm -f Makefile
 patching file build-aux/test-driver
index 4af0eeb1d6b4e4de64a6412a3e5f11dd58aa35f3..d054c46c514697dfbe0021819ae8639f56c38aa1 100644 (file)
@@ -84,12 +84,20 @@ do_create_test ()
   if test -n "$deps_dir"; then
     rmdir $deps_dir
   fi
+  expected_result=${0%.sh}.result
+  expected_result_base=`basename "$expected_result"`
+  # Canonicalize the absolute file name of $tmp-result, that 'make' may print
+  # in its "Entering directory" and "Leaving directory" traces. Also, remove
+  # "configure: autobuild hostname..." and "configure: autobuild timestamp..."
+  # lines.
+  mv $tmp-out $tmp-out~
+  sed -e "s|'[^']*/$tmp-result|'//$expected_result_base|g" -e '/^configure: autobuild [ht]/d' < $tmp-out~ > $tmp-out
+  rm -f $tmp-out~
   if test $rc != 0; then
     cat $tmp-err >&2
     echo "FAIL: gnulib-tool exited with code $rc." >&2
     exit 1
   fi
-  expected_result=${0%.sh}.result
   # Exclude files whose contents depends on the GNU Autoconf version, GNU Automake version, or file time stamps.
   if LC_ALL=C diff -r -q --exclude=aclocal.m4 --exclude=configure --exclude=config.h.in --exclude=Makefile.in --exclude=compile --exclude=depcomp --exclude=missing --exclude=test-driver --exclude=do-autobuild $expected_result $tmp-result; then
     :