Bugfix in testsuite.

* tests/testsuite.at (AT_SORT_PREREQ): New macro.
* tests/upload-dry.at: Avoid dependency on the sort order.

2 files changed, 14 insertions, 7 deletions

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 3821985..d0195e3 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -15,12 +15,16 @@
 # You should have received a copy of the GNU General Public License
 # along with Wydawca.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_version_prereq([2.52g])
 
 m4_define([AT_SKIP_TEST],[exit 77])
+dnl AT_SORT_PREREQ - Skip test if sort utility outputs unwanted data on stderr
+m4_define([AT_SORT_PREREQ],[
+test -z "`sort < /dev/null 2>&1`" || AT_SKIP_TEST
+])
 
 AT_INIT
 AT_TESTED([wydawca])
 m4_include([version.at])
 m4_include([wordsplit.at])
 m4_include([pushdir.at])
diff --git a/tests/upload-dry.at b/tests/upload-dry.at
index 2116af2..e2e4063 100644
--- a/tests/upload-dry.at
+++ b/tests/upload-dry.at
@@ -18,15 +18,12 @@ AT_SETUP([Dry-run upload])
 
 AT_DATA([template],
 [wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started
 wydawca: [[DEBUG]] @WD_SRC@/ok -> @WD_DST@
 wydawca: [[DEBUG]] @WD_SRC@/fail -> @WD_DST@
 wydawca: [[DEBUG]] @WD_SRC@/test -> @WD_DST@
-wydawca: [[DEBUG]] found file file: distributive, stem: file
-wydawca: [[DEBUG]] found file file.directive.asc: signed upload directive, stem: file
-wydawca: [[DEBUG]] found file file.sig: detached signature, stem: file
 wydawca: [[DEBUG]] processing spool test (@WD_DST@)
 wydawca: [[DEBUG]] FILE file, DIST=file, SIG=file.sig, DIRECTIVE=file.directive.asc
 wydawca: [[NOTICE]] Good signature from Wydawca (Testsuite) <bug-wydawca@gnu.org.ua>
 wydawca: [[DEBUG]] file: directive file signature OK
 wydawca: [[NOTICE]] file.directive.asc: VERSION: 1.1
 wydawca: [[DEBUG]] processing triplet `file'
@@ -48,22 +45,28 @@ wydawca: [[INFO]] files archived: 0
 wydawca: [[INFO]] symlinks created: 0
 wydawca: [[INFO]] symlinks removed: 0
 wydawca: [[INFO]] check failures: 0
 wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) finished
 ])
 
-AT_CHECK([
+AT_CHECK([AT_SORT_PREREQ
 wydawca_init_testdirs
 wydawca_config wydawca.rc
 wydawca_upload test file
 
 wydawca_expandmeta template experr
-
-wydawca --no-preproc --dry-run -c wydawca.rc
+set -e
+wydawca --no-preproc --dry-run -c wydawca.rc 2>err 
+set +e
+grep "found file" err | sort
+grep -v "found file" err >&2
 ],
 [0],
-[],
+[wydawca: [[DEBUG]] found file file.directive.asc: signed upload directive, stem: file
+wydawca: [[DEBUG]] found file file.sig: detached signature, stem: file
+wydawca: [[DEBUG]] found file file: distributive, stem: file
+],
 [experr])
 
 wydawca_clean_testdirs
 
 AT_CLEANUP