[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnulib-tool: Ensure that long-running tests are executed last
From: |
Bruno Haible |
Subject: |
gnulib-tool: Ensure that long-running tests are executed last |
Date: |
Fri, 2 Apr 2010 19:08:33 +0100 |
User-agent: |
KMail/1.9.9 |
This ensures that long-running tests are executed last. So that the user
gets the maximum of information as quickly as possible.
2010-04-02 Bruno Haible <address@hidden>
gnulib-tool: Ensure that long-running tests are executed last.
* gnulib-tool (func_emit_tests_Makefile_am): Emit the code for long-
running tests after the one for the other tests.
--- gnulib-tool.orig Fri Apr 2 20:03:18 2010
+++ gnulib-tool Fri Apr 2 19:58:50 2010
@@ -2976,11 +2976,20 @@
} > "$tmp"/amsnippet
# Skip the contents if it's entirely empty.
if grep '[^ ]' "$tmp"/amsnippet > /dev/null ; then
- echo "## begin gnulib module $module"
- echo
- cat "$tmp"/amsnippet
- echo "## end gnulib module $module"
- echo
+ # Mention long-running tests at the end.
+ ofd=3
+ for word in `func_get_status "$module"`; do
+ if test "$word" = 'longrunning-test'; then
+ ofd=4
+ break
+ fi
+ done
+ { echo "## begin gnulib module $module"
+ echo
+ cat "$tmp"/amsnippet
+ echo "## end gnulib module $module"
+ echo
+ } >&$ofd
fi
rm -f "$tmp"/amsnippet
# Test whether there are some source files in subdirectories.
@@ -2994,7 +3003,7 @@
done
fi
done
- } > "$tmp"/allsnippets
+ } 3> "$tmp"/main_snippets 4> "$tmp"/longrunning_snippets
# Generate dependencies here, since it eases the debugging of test failures.
# If there are source files in subdirectories, prevent collision of the
# object files (example: hash.c and libxml/hash.c).
@@ -3030,7 +3039,7 @@
fi
# Automake versions < 1.9b create an empty pkgdatadir at installation time
# if you specify pkgdata_DATA to empty. This is a workaround.
- if grep '^pkgdata_DATA *+=' "$tmp"/allsnippets > /dev/null; then
+ if grep '^pkgdata_DATA *+=' "$tmp"/main_snippets "$tmp"/longrunning_snippets
> /dev/null; then
echo "pkgdata_DATA ="
fi
echo "EXTRA_DIST ="
@@ -3096,7 +3105,7 @@
# srcdir is defined by autoconf and automake.
echo "TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='\$(srcdir)'"
echo
- cat "$tmp"/allsnippets \
+ cat "$tmp"/main_snippets "$tmp"/longrunning_snippets \
| sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g'
echo "# Clean up after Solaris cc."
echo "clean-local:"
@@ -3109,7 +3118,7 @@
echo " fi; \\"
echo " done; \\"
echo " :"
- rm -f "$tmp"/allsnippets
+ rm -f "$tmp"/main_snippets "$tmp"/longrunning_snippets
}
# func_emit_initmacro_start macro_prefix
- gnulib-tool: Ensure that long-running tests are executed last,
Bruno Haible <=