From dc09271cc0d4453e532954db51cd7a6f92ee7ada Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 23 Mar 2024 17:43:49 +0100 Subject: [PATCH] gnulib-tool-tests: Inline the create-tests/*.args files. --- .../create-tests/test-create-megatestdir-1.args | 1 - gnulib-tool-tests/create-tests/test-create-megatestdir-1.sh | 2 +- .../create-tests/test-create-megatestdir-2.args | 1 - gnulib-tool-tests/create-tests/test-create-megatestdir-2.sh | 2 +- gnulib-tool-tests/create-tests/test-create-testdir-1.args | 1 - gnulib-tool-tests/create-tests/test-create-testdir-1.sh | 2 +- gnulib-tool-tests/create-tests/test-create-testdir-2.args | 1 - gnulib-tool-tests/create-tests/test-create-testdir-2.sh | 2 +- gnulib-tool-tests/create-tests/test-create-testdir-3.args | 1 - gnulib-tool-tests/create-tests/test-create-testdir-3.sh | 2 +- gnulib-tool-tests/create-tests/test-create-testdir-4.args | 1 - gnulib-tool-tests/create-tests/test-create-testdir-4.sh | 2 +- gnulib-tool-tests/init.sh | 5 ++++- 13 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 gnulib-tool-tests/create-tests/test-create-megatestdir-1.args delete mode 100644 gnulib-tool-tests/create-tests/test-create-megatestdir-2.args delete mode 100644 gnulib-tool-tests/create-tests/test-create-testdir-1.args delete mode 100644 gnulib-tool-tests/create-tests/test-create-testdir-2.args delete mode 100644 gnulib-tool-tests/create-tests/test-create-testdir-3.args delete mode 100644 gnulib-tool-tests/create-tests/test-create-testdir-4.args diff --git a/gnulib-tool-tests/create-tests/test-create-megatestdir-1.args b/gnulib-tool-tests/create-tests/test-create-megatestdir-1.args deleted file mode 100644 index 6243f13b..00000000 --- a/gnulib-tool-tests/create-tests/test-create-megatestdir-1.args +++ /dev/null @@ -1 +0,0 @@ ---create-megatestdir --single-configure fopen fopen-gnu diff --git a/gnulib-tool-tests/create-tests/test-create-megatestdir-1.sh b/gnulib-tool-tests/create-tests/test-create-megatestdir-1.sh index d043a93e..8c052a99 100755 --- a/gnulib-tool-tests/create-tests/test-create-megatestdir-1.sh +++ b/gnulib-tool-tests/create-tests/test-create-megatestdir-1.sh @@ -1,3 +1,3 @@ #!/bin/sh . ../init.sh -do_create_test +do_create_test "--create-megatestdir --single-configure fopen fopen-gnu" diff --git a/gnulib-tool-tests/create-tests/test-create-megatestdir-2.args b/gnulib-tool-tests/create-tests/test-create-megatestdir-2.args deleted file mode 100644 index 01b2016f..00000000 --- a/gnulib-tool-tests/create-tests/test-create-megatestdir-2.args +++ /dev/null @@ -1 +0,0 @@ ---create-megatestdir fopen fopen-gnu diff --git a/gnulib-tool-tests/create-tests/test-create-megatestdir-2.sh b/gnulib-tool-tests/create-tests/test-create-megatestdir-2.sh index d043a93e..9bdd3848 100755 --- a/gnulib-tool-tests/create-tests/test-create-megatestdir-2.sh +++ b/gnulib-tool-tests/create-tests/test-create-megatestdir-2.sh @@ -1,3 +1,3 @@ #!/bin/sh . ../init.sh -do_create_test +do_create_test "--create-megatestdir fopen fopen-gnu" diff --git a/gnulib-tool-tests/create-tests/test-create-testdir-1.args b/gnulib-tool-tests/create-tests/test-create-testdir-1.args deleted file mode 100644 index bc48a720..00000000 --- a/gnulib-tool-tests/create-tests/test-create-testdir-1.args +++ /dev/null @@ -1 +0,0 @@ ---create-testdir --single-configure regex diff --git a/gnulib-tool-tests/create-tests/test-create-testdir-1.sh b/gnulib-tool-tests/create-tests/test-create-testdir-1.sh index d043a93e..a21b50ee 100755 --- a/gnulib-tool-tests/create-tests/test-create-testdir-1.sh +++ b/gnulib-tool-tests/create-tests/test-create-testdir-1.sh @@ -1,3 +1,3 @@ #!/bin/sh . ../init.sh -do_create_test +do_create_test "--create-testdir --single-configure regex" diff --git a/gnulib-tool-tests/create-tests/test-create-testdir-2.args b/gnulib-tool-tests/create-tests/test-create-testdir-2.args deleted file mode 100644 index 484b2a4c..00000000 --- a/gnulib-tool-tests/create-tests/test-create-testdir-2.args +++ /dev/null @@ -1 +0,0 @@ ---create-testdir regex diff --git a/gnulib-tool-tests/create-tests/test-create-testdir-2.sh b/gnulib-tool-tests/create-tests/test-create-testdir-2.sh index d043a93e..4339923e 100755 --- a/gnulib-tool-tests/create-tests/test-create-testdir-2.sh +++ b/gnulib-tool-tests/create-tests/test-create-testdir-2.sh @@ -1,3 +1,3 @@ #!/bin/sh . ../init.sh -do_create_test +do_create_test "--create-testdir regex" diff --git a/gnulib-tool-tests/create-tests/test-create-testdir-3.args b/gnulib-tool-tests/create-tests/test-create-testdir-3.args deleted file mode 100644 index 8d5c829a..00000000 --- a/gnulib-tool-tests/create-tests/test-create-testdir-3.args +++ /dev/null @@ -1 +0,0 @@ ---create-testdir --single-configure libtextstyle-optional diff --git a/gnulib-tool-tests/create-tests/test-create-testdir-3.sh b/gnulib-tool-tests/create-tests/test-create-testdir-3.sh index d043a93e..e9b551da 100755 --- a/gnulib-tool-tests/create-tests/test-create-testdir-3.sh +++ b/gnulib-tool-tests/create-tests/test-create-testdir-3.sh @@ -1,3 +1,3 @@ #!/bin/sh . ../init.sh -do_create_test +do_create_test "--create-testdir --single-configure libtextstyle-optional" diff --git a/gnulib-tool-tests/create-tests/test-create-testdir-4.args b/gnulib-tool-tests/create-tests/test-create-testdir-4.args deleted file mode 100644 index a16f8a95..00000000 --- a/gnulib-tool-tests/create-tests/test-create-testdir-4.args +++ /dev/null @@ -1 +0,0 @@ ---create-testdir --single-configure --with-c++-tests --without-privileged-tests diff --git a/gnulib-tool-tests/create-tests/test-create-testdir-4.sh b/gnulib-tool-tests/create-tests/test-create-testdir-4.sh index d043a93e..6e82688e 100755 --- a/gnulib-tool-tests/create-tests/test-create-testdir-4.sh +++ b/gnulib-tool-tests/create-tests/test-create-testdir-4.sh @@ -1,3 +1,3 @@ #!/bin/sh . ../init.sh -do_create_test +do_create_test "--create-testdir --single-configure --with-c++-tests --without-privileged-tests" diff --git a/gnulib-tool-tests/init.sh b/gnulib-tool-tests/init.sh index c3625ca8..4af0eeb1 100644 --- a/gnulib-tool-tests/init.sh +++ b/gnulib-tool-tests/init.sh @@ -71,10 +71,13 @@ do_info_test () exit 0 } +# do_create_test GNULIB_TOOL_ARGS +# runs a test that creates a directory. +# GNULIB_TOOL_ARGS arguments to pass to gnulib-tool do_create_test () { tmp=tmp$$ - $GNULIB_SRCDIR/gnulib-tool --gnulib-dir=../gnulib-data --dir=$tmp-result `cat ${0%.sh}.args` >$tmp-out 2>$tmp-err + $GNULIB_SRCDIR/gnulib-tool --gnulib-dir=../gnulib-data --dir=$tmp-result $1 >$tmp-out 2>$tmp-err rc=$? # Remove .deps dirs, since we cannot check them in as part of the expected result. deps_dir=`find $tmp-result -name .deps -type d -print` -- 2.39.5