From f03cfe78dac0750b1084216e3d5e4c46e0d337e8 Mon Sep 17 00:00:00 2001 From: Eryu Guan Date: Thu, 8 Feb 2018 20:18:31 +0800 Subject: [PATCH] overlay: renumber tests after merge Tests were merged with high seq numbers to avoid conflicts with other tests. Now renumber them to contiguous numbers, as all other tests have been merged correctly. This is easier to do than assigning the final seq numbers at commit time. Signed-off-by: Eryu Guan --- tests/overlay/{201 => 045} | 2 +- tests/overlay/{201.out => 045.out} | 2 +- tests/overlay/{202 => 046} | 2 +- tests/overlay/{202.out => 046.out} | 2 +- tests/overlay/{203 => 056} | 2 +- tests/overlay/{203.out => 056.out} | 2 +- tests/overlay/group | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) rename tests/overlay/{201 => 045} (99%) rename tests/overlay/{201.out => 045.out} (87%) rename tests/overlay/{202 => 046} (99%) rename tests/overlay/{202.out => 046.out} (89%) rename tests/overlay/{203 => 056} (99%) rename tests/overlay/{203.out => 056.out} (69%) diff --git a/tests/overlay/201 b/tests/overlay/045 similarity index 99% rename from tests/overlay/201 rename to tests/overlay/045 index 77e57187..6158dbd5 100755 --- a/tests/overlay/201 +++ b/tests/overlay/045 @@ -1,5 +1,5 @@ #! /bin/bash -# FS QA Test 201 +# FS QA Test No. 045 # # Test fsck.overlay how to deal with whiteouts in overlayfs. # diff --git a/tests/overlay/201.out b/tests/overlay/045.out similarity index 87% rename from tests/overlay/201.out rename to tests/overlay/045.out index 157bb85c..cfb40388 100644 --- a/tests/overlay/201.out +++ b/tests/overlay/045.out @@ -1,4 +1,4 @@ -QA output created by 201 +QA output created by 045 + Orphan whiteout + Valid whiteout + Orphan whiteout(2) diff --git a/tests/overlay/202 b/tests/overlay/046 similarity index 99% rename from tests/overlay/202 rename to tests/overlay/046 index e411b942..b0ede6cd 100755 --- a/tests/overlay/202 +++ b/tests/overlay/046 @@ -1,5 +1,5 @@ #! /bin/bash -# FS QA Test 202 +# FS QA Test No. 046 # # Test fsck.overlay how to deal with redirect xattr in overlayfs. # diff --git a/tests/overlay/202.out b/tests/overlay/046.out similarity index 89% rename from tests/overlay/202.out rename to tests/overlay/046.out index 99d2b328..4f69d557 100644 --- a/tests/overlay/202.out +++ b/tests/overlay/046.out @@ -1,4 +1,4 @@ -QA output created by 202 +QA output created by 046 + Invalid redirect + Invalid redirect(2) + Valid redirect diff --git a/tests/overlay/203 b/tests/overlay/056 similarity index 99% rename from tests/overlay/203 rename to tests/overlay/056 index 70dd7fdc..3a85c821 100755 --- a/tests/overlay/203 +++ b/tests/overlay/056 @@ -1,5 +1,5 @@ #! /bin/bash -# FS QA Test 203 +# FS QA Test No. 056 # # Test fsck.overlay how to deal with impure xattr in overlayfs. # diff --git a/tests/overlay/203.out b/tests/overlay/056.out similarity index 69% rename from tests/overlay/203.out rename to tests/overlay/056.out index dd81788e..48eb1c91 100644 --- a/tests/overlay/203.out +++ b/tests/overlay/056.out @@ -1,4 +1,4 @@ -QA output created by 203 +QA output created by 056 + Missing impure + Missing impure(2) + Missing impure(3) diff --git a/tests/overlay/group b/tests/overlay/group index e8f2d419..65f1fe63 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -47,6 +47,8 @@ 042 auto quick copyup hardlink 043 auto quick copyup nonsamefs 044 auto quick copyup hardlink nonsamefs +045 auto quick fsck +046 auto quick fsck 047 auto quick copyup hardlink 048 auto quick copyup hardlink 049 auto quick copyup redirect @@ -56,6 +58,4 @@ 053 auto quick copyup redirect exportfs nonsamefs 054 auto quick copyup redirect exportfs 055 auto quick copyup redirect exportfs nonsamefs -201 auto quick fsck -202 auto quick fsck -203 auto quick fsck +056 auto quick fsck -- 2.47.3