New checks exclude08 & exclude11 were failing due to bad order of files stored into tarball. Fix attached.
Pavel
>From b850e54071fba64afbd03081bed8aeebfe368c0b Mon Sep 17 00:00:00 2001 From: Pavel Raiskup <prais...@redhat.com> Date: Wed, 26 Jun 2013 17:35:41 +0200 Subject: [PATCH] testsuite: do not resist on file order in archive On my Fedora 19 box, the exclude08 & exclude11 tests failed before this fix. The reason was that the directory traversing chosen the file order differently than the testsuite expected. * tests/exclude08.at: Sort the tarball content output. * tests/exclude09.at: Likewise. * tests/exclude10.at: Likewise. * tests/exclude11.at: Likewise. * tests/exclude12.at: Likewise. * tests/exclude13.at: Likewise. * tests/exclude14.at: Likewise. * tests/exclude15.at: Likewise. * tests/exclude16.at: Likewise. --- tests/exclude08.at | 3 ++- tests/exclude09.at | 5 +++-- tests/exclude10.at | 7 ++++--- tests/exclude11.at | 3 ++- tests/exclude12.at | 3 ++- tests/exclude13.at | 7 ++++--- tests/exclude14.at | 3 ++- tests/exclude15.at | 3 ++- tests/exclude16.at | 7 ++++--- 9 files changed, 25 insertions(+), 16 deletions(-) diff --git a/tests/exclude08.at b/tests/exclude08.at index ccd26c9..aa35270 100644 --- a/tests/exclude08.at +++ b/tests/exclude08.at @@ -37,8 +37,9 @@ AT_SETUP([--exclude-tag option]) AT_KEYWORDS([exclude exclude-tag exclude08]) AT_TAR_CHECK([ +AT_SORT_PREREQ mkexcltest etest -tar -c -f etest.tar --exclude-tag=excludeme -v etest +tar -c -f etest.tar --exclude-tag=excludeme -v etest | sort ], [0], [etest/ diff --git a/tests/exclude09.at b/tests/exclude09.at index 6ccfb18..d60bcfe 100644 --- a/tests/exclude09.at +++ b/tests/exclude09.at @@ -38,14 +38,15 @@ AT_SETUP([--exclude-tag option and --listed-incremental]) AT_KEYWORDS([exclude exclude-tag listed incremental exclude09]) AT_TAR_CHECK([ +AT_SORT_PREREQ mkexcltest etest -tar -c -f etest.tar --exclude-tag=excludeme --listed=snar -v etest +tar -c -f etest.tar --exclude-tag=excludeme --listed=snar -v etest | sort ], [0], [etest/ etest/subdir/ -etest/top-level-file etest/subdir/excludeme +etest/top-level-file ], [tar: etest: Directory is new tar: etest/subdir: Directory is new diff --git a/tests/exclude10.at b/tests/exclude10.at index c95cb53..fadd020 100644 --- a/tests/exclude10.at +++ b/tests/exclude10.at @@ -39,23 +39,24 @@ AT_SETUP([--exclude-tag option in incremental pass]) AT_KEYWORDS([exclude exclude-tag listed incremental exclude10]) AT_TAR_CHECK([ +AT_SORT_PREREQ mkexcltest etest rm etest/subdir/excludeme decho "# Level 0" -tar -c -f etest-0.tar --exclude-tag=excludeme --listed=snar-0 -v etest +tar -c -f etest-0.tar --exclude-tag=excludeme --listed=snar-0 -v etest | sort touch etest/subdir/excludeme touch etest/subdir/otherfile decho "# Level 1" cp snar-0 snar-1 -tar -c -f etest-1.tar --exclude-tag=excludeme --listed=snar-1 -v etest +tar -c -f etest-1.tar --exclude-tag=excludeme --listed=snar-1 -v etest | sort ], [0], [# Level 0 etest/ etest/subdir/ -etest/top-level-file etest/subdir/subdir-file +etest/top-level-file # Level 1 etest/ etest/subdir/ diff --git a/tests/exclude11.at b/tests/exclude11.at index 6b5ef51..ae78743 100644 --- a/tests/exclude11.at +++ b/tests/exclude11.at @@ -37,8 +37,9 @@ AT_SETUP([--exclude-tag-under option]) AT_KEYWORDS([exclude exclude-tag exclude-tag-under exclude11]) AT_TAR_CHECK([ +AT_SORT_PREREQ mkexcltest etest -tar -c -f etest.tar --exclude-tag-under=excludeme -v etest +tar -c -f etest.tar --exclude-tag-under=excludeme -v etest | sort ], [0], [etest/ diff --git a/tests/exclude12.at b/tests/exclude12.at index 7121f07..b5b7824 100644 --- a/tests/exclude12.at +++ b/tests/exclude12.at @@ -38,8 +38,9 @@ AT_SETUP([--exclude-tag-under and --listed-incremental]) AT_KEYWORDS([exclude exclude-tag exclude-tag-under listed incremental exclude12]) AT_TAR_CHECK([ +AT_SORT_PREREQ mkexcltest etest -tar -c -f etest.tar --exclude-tag-under=excludeme --listed=snar -v etest +tar -c -f etest.tar --exclude-tag-under=excludeme --listed=snar -v etest | sort ], [0], [etest/ diff --git a/tests/exclude13.at b/tests/exclude13.at index 4a36076..34353f4 100644 --- a/tests/exclude13.at +++ b/tests/exclude13.at @@ -40,23 +40,24 @@ AT_SETUP([--exclude-tag-under option in incremental pass]) AT_KEYWORDS([exclude exclude-tag exclude-tag-under listed incremental exclude13]) AT_TAR_CHECK([ +AT_SORT_PREREQ mkexcltest etest rm etest/subdir/excludeme decho "# Level 0" -tar -c -f etest-0.tar --exclude-tag-under=excludeme --listed=snar-0 -v etest +tar -c -f etest-0.tar --exclude-tag-under=excludeme --listed=snar-0 -v etest | sort touch etest/subdir/excludeme touch etest/subdir/otherfile decho "# Level 1" cp snar-0 snar-1 -tar -c -f etest-1.tar --exclude-tag-under=excludeme --listed=snar-1 -v etest +tar -c -f etest-1.tar --exclude-tag-under=excludeme --listed=snar-1 -v etest | sort ], [0], [# Level 0 etest/ etest/subdir/ -etest/top-level-file etest/subdir/subdir-file +etest/top-level-file # Level 1 etest/ etest/subdir/ diff --git a/tests/exclude14.at b/tests/exclude14.at index 9032366..22aac86 100644 --- a/tests/exclude14.at +++ b/tests/exclude14.at @@ -37,8 +37,9 @@ AT_SETUP([--exclude-tag-all option]) AT_KEYWORDS([exclude exclude-tag exclude-tag-all exclude14]) AT_TAR_CHECK([ +AT_SORT_PREREQ mkexcltest etest -tar -c -f etest.tar --exclude-tag-all=excludeme -v etest +tar -c -f etest.tar --exclude-tag-all=excludeme -v etest | sort ], [0], [etest/ diff --git a/tests/exclude15.at b/tests/exclude15.at index 2c98c35..7c1f6c7 100644 --- a/tests/exclude15.at +++ b/tests/exclude15.at @@ -37,8 +37,9 @@ AT_SETUP([--exclude-tag-all and --listed-incremental]) AT_KEYWORDS([exclude exclude-tag exclude-tag-all listed incremental exclude15]) AT_TAR_CHECK([ +AT_SORT_PREREQ mkexcltest etest -tar -c -f etest.tar --exclude-tag-all=excludeme --listed=snar -v etest +tar -c -f etest.tar --exclude-tag-all=excludeme --listed=snar -v etest | sort ], [0], [etest/ diff --git a/tests/exclude16.at b/tests/exclude16.at index 5254ef8..6f7c894 100644 --- a/tests/exclude16.at +++ b/tests/exclude16.at @@ -39,23 +39,24 @@ AT_SETUP([--exclude-tag-all option in incremental pass]) AT_KEYWORDS([exclude exclude-tag exclude-tag-all listed incremental exclude16]) AT_TAR_CHECK([ +AT_SORT_PREREQ mkexcltest etest rm etest/subdir/excludeme decho "# Level 0" -tar -c -f etest-0.tar --exclude-tag-all=excludeme --listed=snar-0 -v etest +tar -c -f etest-0.tar --exclude-tag-all=excludeme --listed=snar-0 -v etest | sort touch etest/subdir/excludeme touch etest/subdir/otherfile decho "# Level 1" cp snar-0 snar-1 -tar -c -f etest-1.tar --exclude-tag-all=excludeme --listed=snar-1 -v etest +tar -c -f etest-1.tar --exclude-tag-all=excludeme --listed=snar-1 -v etest | sort ], [0], [# Level 0 etest/ etest/subdir/ -etest/top-level-file etest/subdir/subdir-file +etest/top-level-file # Level 1 etest/ ], -- 1.8.2.1
