tests: create expected/$(component)/$(testname)

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/expected/ts-cal-1 b/tests/expected/cal/1m
similarity index 87%
rename from tests/expected/ts-cal-1
rename to tests/expected/cal/1m
index f657875bc0079eadabbbcb9e45f0706ebda17707..f15bbc0f6896dbaf88de005b23a05e518f480e3d 100644 (file)
--- a/tests/expected/ts-cal-1
+++ b/tests/expected/cal/1m
@@ -1,6 +1,6 @@
 
 Gregorian - Monday-based week
-   September 2006   
+   September 2006
 Mo Tu We Th Fr Sa Su
              1  2  3
  4  5  6  7  8  9 10
@@ -9,7 +9,7 @@ Mo Tu We Th Fr Sa Su
 25 26 27 28 29 30
 
 Gregorian - Sunday-based week
-   September 2006   
+   September 2006
 Su Mo Tu We Th Fr Sa
                 1  2
  3  4  5  6  7  8  9
@@ -18,7 +18,7 @@ Su Mo Tu We Th Fr Sa
 24 25 26 27 28 29 30
 
 Julian - Monday-based week
-       September 2006      
+       September 2006
 Mon Tue Wed Thu Fri Sat Sun
                 244 245 246
 247 248 249 250 251 252 253
@@ -27,7 +27,7 @@ Mon Tue Wed Thu Fri Sat Sun
 268 269 270 271 272 273
 
 Julian - Sunday-based week
-       September 2006      
+       September 2006
 Sun Mon Tue Wed Thu Fri Sat
                     244 245
 246 247 248 249 250 251 252

diff --git a/tests/expected/ts-cal-3 b/tests/expected/cal/3m
similarity index 80%
rename from tests/expected/ts-cal-3
rename to tests/expected/cal/3m
index ba9657dd2e54edb507ea30a077cb8a248cf58e8a..f1531cf04c4c959faf7bc316c855d8a3eba1619e 100644 (file)
--- a/tests/expected/ts-cal-3
+++ b/tests/expected/cal/3m
@@ -1,37 +1,37 @@
 
 Gregorian - Monday-based week
-     August 2006         September 2006         October 2006    
+     August 2006         September 2006         October 2006
 Mo Tu We Th Fr Sa Su  Mo Tu We Th Fr Sa Su  Mo Tu We Th Fr Sa Su
     1  2  3  4  5  6               1  2  3                     1
  7  8  9 10 11 12 13   4  5  6  7  8  9 10   2  3  4  5  6  7  8
 14 15 16 17 18 19 20  11 12 13 14 15 16 17   9 10 11 12 13 14 15
 21 22 23 24 25 26 27  18 19 20 21 22 23 24  16 17 18 19 20 21 22
 28 29 30 31           25 26 27 28 29 30     23 24 25 26 27 28 29
-                                            30 31               
+                                            30 31
 Gregorian - Sunday-based week
-     August 2006         September 2006         October 2006    
+     August 2006         September 2006         October 2006
 Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa
        1  2  3  4  5                  1  2   1  2  3  4  5  6  7
  6  7  8  9 10 11 12   3  4  5  6  7  8  9   8  9 10 11 12 13 14
 13 14 15 16 17 18 19  10 11 12 13 14 15 16  15 16 17 18 19 20 21
 20 21 22 23 24 25 26  17 18 19 20 21 22 23  22 23 24 25 26 27 28
-27 28 29 30 31        24 25 26 27 28 29 30  29 30 31            
-                                                                
+27 28 29 30 31        24 25 26 27 28 29 30  29 30 31
+
 Julian - Monday-based week
-        August 2006                 September 2006                October 2006       
+        August 2006                 September 2006                October 2006
 Mon Tue Wed Thu Fri Sat Sun  Mon Tue Wed Thu Fri Sat Sun  Mon Tue Wed Thu Fri Sat Sun
     213 214 215 216 217 218                  244 245 246                          274
 219 220 221 222 223 224 225  247 248 249 250 251 252 253  275 276 277 278 279 280 281
 226 227 228 229 230 231 232  254 255 256 257 258 259 260  282 283 284 285 286 287 288
 233 234 235 236 237 238 239  261 262 263 264 265 266 267  289 290 291 292 293 294 295
 240 241 242 243              268 269 270 271 272 273      296 297 298 299 300 301 302
-                                                          303 304                    
+                                                          303 304
 Julian - Sunday-based week
-        August 2006                 September 2006                October 2006       
+        August 2006                 September 2006                October 2006
 Sun Mon Tue Wed Thu Fri Sat  Sun Mon Tue Wed Thu Fri Sat  Sun Mon Tue Wed Thu Fri Sat
         213 214 215 216 217                      244 245  274 275 276 277 278 279 280
 218 219 220 221 222 223 224  246 247 248 249 250 251 252  281 282 283 284 285 286 287
 225 226 227 228 229 230 231  253 254 255 256 257 258 259  288 289 290 291 292 293 294
 232 233 234 235 236 237 238  260 261 262 263 264 265 266  295 296 297 298 299 300 301
-239 240 241 242 243          267 268 269 270 271 272 273  302 303 304                
-                                                                                     
+239 240 241 242 243          267 268 269 270 271 272 273  302 303 304
+

diff --git a/tests/expected/ts-cal-y b/tests/expected/cal/year
similarity index 83%
rename from tests/expected/ts-cal-y
rename to tests/expected/cal/year
index 616d61a0c234d5b90ad1968dc0183b693ea7fd31..e4713ccb71f9f128a0e5198b30c010b84459d759 100644 (file)
--- a/tests/expected/ts-cal-y
+++ b/tests/expected/cal/year
@@ -1,8 +1,8 @@
 
 Gregorian - Monday-based week
-                               2006                               
+                               2006
 
-       January               February                 March       
+       January               February                 March
 Mo Tu We Th Fr Sa Su   Mo Tu We Th Fr Sa Su   Mo Tu We Th Fr Sa Su
                    1          1  2  3  4  5          1  2  3  4  5
  2  3  4  5  6  7  8    6  7  8  9 10 11 12    6  7  8  9 10 11 12
@@ -10,7 +10,7 @@ Mo Tu We Th Fr Sa Su   Mo Tu We Th Fr Sa Su   Mo Tu We Th Fr Sa Su
 16 17 18 19 20 21 22   20 21 22 23 24 25 26   20 21 22 23 24 25 26
 23 24 25 26 27 28 29   27 28                  27 28 29 30 31
 30 31
-        April                   May                   June        
+        April                   May                   June
 Mo Tu We Th Fr Sa Su   Mo Tu We Th Fr Sa Su   Mo Tu We Th Fr Sa Su
                 1  2    1  2  3  4  5  6  7             1  2  3  4
  3  4  5  6  7  8  9    8  9 10 11 12 13 14    5  6  7  8  9 10 11
@@ -18,7 +18,7 @@ Mo Tu We Th Fr Sa Su   Mo Tu We Th Fr Sa Su   Mo Tu We Th Fr Sa Su
 17 18 19 20 21 22 23   22 23 24 25 26 27 28   19 20 21 22 23 24 25
 24 25 26 27 28 29 30   29 30 31               26 27 28 29 30
 
-        July                  August                September     
+        July                  August                September
 Mo Tu We Th Fr Sa Su   Mo Tu We Th Fr Sa Su   Mo Tu We Th Fr Sa Su
                 1  2       1  2  3  4  5  6                1  2  3
  3  4  5  6  7  8  9    7  8  9 10 11 12 13    4  5  6  7  8  9 10
@@ -26,7 +26,7 @@ Mo Tu We Th Fr Sa Su   Mo Tu We Th Fr Sa Su   Mo Tu We Th Fr Sa Su
 17 18 19 20 21 22 23   21 22 23 24 25 26 27   18 19 20 21 22 23 24
 24 25 26 27 28 29 30   28 29 30 31            25 26 27 28 29 30
 31
-       October               November               December      
+       October               November               December
 Mo Tu We Th Fr Sa Su   Mo Tu We Th Fr Sa Su   Mo Tu We Th Fr Sa Su
                    1          1  2  3  4  5                1  2  3
  2  3  4  5  6  7  8    6  7  8  9 10 11 12    4  5  6  7  8  9 10
@@ -36,9 +36,9 @@ Mo Tu We Th Fr Sa Su   Mo Tu We Th Fr Sa Su   Mo Tu We Th Fr Sa Su
 30 31
 
 Gregorian - Sunday-based week
-                               2006                               
+                               2006
 
-       January               February                 March       
+       January               February                 March
 Su Mo Tu We Th Fr Sa   Su Mo Tu We Th Fr Sa   Su Mo Tu We Th Fr Sa
  1  2  3  4  5  6  7             1  2  3  4             1  2  3  4
  8  9 10 11 12 13 14    5  6  7  8  9 10 11    5  6  7  8  9 10 11
@@ -46,7 +46,7 @@ Su Mo Tu We Th Fr Sa   Su Mo Tu We Th Fr Sa   Su Mo Tu We Th Fr Sa
 22 23 24 25 26 27 28   19 20 21 22 23 24 25   19 20 21 22 23 24 25
 29 30 31               26 27 28               26 27 28 29 30 31
 
-        April                   May                   June        
+        April                   May                   June
 Su Mo Tu We Th Fr Sa   Su Mo Tu We Th Fr Sa   Su Mo Tu We Th Fr Sa
                    1       1  2  3  4  5  6                1  2  3
  2  3  4  5  6  7  8    7  8  9 10 11 12 13    4  5  6  7  8  9 10
@@ -54,7 +54,7 @@ Su Mo Tu We Th Fr Sa   Su Mo Tu We Th Fr Sa   Su Mo Tu We Th Fr Sa
 16 17 18 19 20 21 22   21 22 23 24 25 26 27   18 19 20 21 22 23 24
 23 24 25 26 27 28 29   28 29 30 31            25 26 27 28 29 30
 30
-        July                  August                September     
+        July                  August                September
 Su Mo Tu We Th Fr Sa   Su Mo Tu We Th Fr Sa   Su Mo Tu We Th Fr Sa
                    1          1  2  3  4  5                   1  2
  2  3  4  5  6  7  8    6  7  8  9 10 11 12    3  4  5  6  7  8  9
@@ -62,7 +62,7 @@ Su Mo Tu We Th Fr Sa   Su Mo Tu We Th Fr Sa   Su Mo Tu We Th Fr Sa
 16 17 18 19 20 21 22   20 21 22 23 24 25 26   17 18 19 20 21 22 23
 23 24 25 26 27 28 29   27 28 29 30 31         24 25 26 27 28 29 30
 30 31
-       October               November               December      
+       October               November               December
 Su Mo Tu We Th Fr Sa   Su Mo Tu We Th Fr Sa   Su Mo Tu We Th Fr Sa
  1  2  3  4  5  6  7             1  2  3  4                   1  2
  8  9 10 11 12 13 14    5  6  7  8  9 10 11    3  4  5  6  7  8  9
@@ -72,9 +72,9 @@ Su Mo Tu We Th Fr Sa   Su Mo Tu We Th Fr Sa   Su Mo Tu We Th Fr Sa
                                               31
 
 Julian - Monday-based week
-                           2006                          
+                           2006
 
-          January                       February         
+          January                       February
 Mon Tue Wed Thu Fri Sat Sun   Mon Tue Wed Thu Fri Sat Sun
                           1            32  33  34  35  36
   2   3   4   5   6   7   8    37  38  39  40  41  42  43
@@ -82,7 +82,7 @@ Mon Tue Wed Thu Fri Sat Sun   Mon Tue Wed Thu Fri Sat Sun
  16  17  18  19  20  21  22    51  52  53  54  55  56  57
  23  24  25  26  27  28  29    58  59
  30  31
-           March                         April           
+           March                         April
 Mon Tue Wed Thu Fri Sat Sun   Mon Tue Wed Thu Fri Sat Sun
          60  61  62  63  64                        91  92
  65  66  67  68  69  70  71    93  94  95  96  97  98  99
@@ -90,7 +90,7 @@ Mon Tue Wed Thu Fri Sat Sun   Mon Tue Wed Thu Fri Sat Sun
  79  80  81  82  83  84  85   107 108 109 110 111 112 113
  86  87  88  89  90           114 115 116 117 118 119 120
 
-            May                           June           
+            May                           June
 Mon Tue Wed Thu Fri Sat Sun   Mon Tue Wed Thu Fri Sat Sun
 121 122 123 124 125 126 127               152 153 154 155
 128 129 130 131 132 133 134   156 157 158 159 160 161 162
@@ -98,7 +98,7 @@ Mon Tue Wed Thu Fri Sat Sun   Mon Tue Wed Thu Fri Sat Sun
 142 143 144 145 146 147 148   170 171 172 173 174 175 176
 149 150 151                   177 178 179 180 181
 
-            July                         August          
+            July                         August
 Mon Tue Wed Thu Fri Sat Sun   Mon Tue Wed Thu Fri Sat Sun
                     182 183       213 214 215 216 217 218
 184 185 186 187 188 189 190   219 220 221 222 223 224 225
@@ -106,7 +106,7 @@ Mon Tue Wed Thu Fri Sat Sun   Mon Tue Wed Thu Fri Sat Sun
 198 199 200 201 202 203 204   233 234 235 236 237 238 239
 205 206 207 208 209 210 211   240 241 242 243
 212
-         September                      October          
+         September                      October
 Mon Tue Wed Thu Fri Sat Sun   Mon Tue Wed Thu Fri Sat Sun
                 244 245 246                           274
 247 248 249 250 251 252 253   275 276 277 278 279 280 281
@@ -114,7 +114,7 @@ Mon Tue Wed Thu Fri Sat Sun   Mon Tue Wed Thu Fri Sat Sun
 261 262 263 264 265 266 267   289 290 291 292 293 294 295
 268 269 270 271 272 273       296 297 298 299 300 301 302
                               303 304
-          November                      December         
+          November                      December
 Mon Tue Wed Thu Fri Sat Sun   Mon Tue Wed Thu Fri Sat Sun
         305 306 307 308 309                   335 336 337
 310 311 312 313 314 315 316   338 339 340 341 342 343 344
@@ -124,9 +124,9 @@ Mon Tue Wed Thu Fri Sat Sun   Mon Tue Wed Thu Fri Sat Sun
 
 
 Julian - Sunday-based week
-                           2006                          
+                           2006
 
-          January                       February         
+          January                       February
 Sun Mon Tue Wed Thu Fri Sat   Sun Mon Tue Wed Thu Fri Sat
   1   2   3   4   5   6   7                32  33  34  35
   8   9  10  11  12  13  14    36  37  38  39  40  41  42
@@ -134,7 +134,7 @@ Sun Mon Tue Wed Thu Fri Sat   Sun Mon Tue Wed Thu Fri Sat
  22  23  24  25  26  27  28    50  51  52  53  54  55  56
  29  30  31                    57  58  59
 
-           March                         April           
+           March                         April
 Sun Mon Tue Wed Thu Fri Sat   Sun Mon Tue Wed Thu Fri Sat
              60  61  62  63                            91
  64  65  66  67  68  69  70    92  93  94  95  96  97  98
@@ -142,7 +142,7 @@ Sun Mon Tue Wed Thu Fri Sat   Sun Mon Tue Wed Thu Fri Sat
  78  79  80  81  82  83  84   106 107 108 109 110 111 112
  85  86  87  88  89  90       113 114 115 116 117 118 119
                               120
-            May                           June           
+            May                           June
 Sun Mon Tue Wed Thu Fri Sat   Sun Mon Tue Wed Thu Fri Sat
     121 122 123 124 125 126                   152 153 154
 127 128 129 130 131 132 133   155 156 157 158 159 160 161
@@ -150,7 +150,7 @@ Sun Mon Tue Wed Thu Fri Sat   Sun Mon Tue Wed Thu Fri Sat
 141 142 143 144 145 146 147   169 170 171 172 173 174 175
 148 149 150 151               176 177 178 179 180 181
 
-            July                         August          
+            July                         August
 Sun Mon Tue Wed Thu Fri Sat   Sun Mon Tue Wed Thu Fri Sat
                         182           213 214 215 216 217
 183 184 185 186 187 188 189   218 219 220 221 222 223 224
@@ -158,7 +158,7 @@ Sun Mon Tue Wed Thu Fri Sat   Sun Mon Tue Wed Thu Fri Sat
 197 198 199 200 201 202 203   232 233 234 235 236 237 238
 204 205 206 207 208 209 210   239 240 241 242 243
 211 212
-         September                      October          
+         September                      October
 Sun Mon Tue Wed Thu Fri Sat   Sun Mon Tue Wed Thu Fri Sat
                     244 245   274 275 276 277 278 279 280
 246 247 248 249 250 251 252   281 282 283 284 285 286 287
@@ -166,7 +166,7 @@ Sun Mon Tue Wed Thu Fri Sat   Sun Mon Tue Wed Thu Fri Sat
 260 261 262 263 264 265 266   295 296 297 298 299 300 301
 267 268 269 270 271 272 273   302 303 304
 
-          November                      December         
+          November                      December
 Sun Mon Tue Wed Thu Fri Sat   Sun Mon Tue Wed Thu Fri Sat
             305 306 307 308                       335 336
 309 310 311 312 313 314 315   337 338 339 340 341 342 343

diff --git a/tests/expected/ts-col-multibyte b/tests/expected/col/multibyte
similarity index 100%
rename from tests/expected/ts-col-multibyte
rename to tests/expected/col/multibyte

diff --git a/tests/expected/ts-cramfs-mkfs b/tests/expected/cramfs/mkfs
similarity index 100%
rename from tests/expected/ts-cramfs-mkfs
rename to tests/expected/cramfs/mkfs

diff --git a/tests/expected/ts-ipcs-headers b/tests/expected/ipcs/headers
similarity index 67%
rename from tests/expected/ts-ipcs-headers
rename to tests/expected/ipcs/headers
index 155d3080eeeb56f5e71fad9d54a84598414fde53..19283951380c5642f999202cedc5ef3d65b86c23 100644 (file)
--- a/tests/expected/ts-ipcs-headers
+++ b/tests/expected/ipcs/headers
@@ -1,61 +1,61 @@
 test: shm headers
 ------ Shared Memory Attach/Detach/Change Times --------
-shmid      owner      attached             detached             changed             
+shmid      owner      attached             detached             changed
 ------ Shared Memory Creator/Last-op --------
-shmid      owner      cpid       lpid      
+shmid      owner      cpid       lpid
 ------ Shared Memory Segment Creators/Owners --------
-shmid      perms      cuid       cgid       uid        gid       
+shmid      perms      cuid       cgid       uid        gid
 ------ Shared Memory Limits --------
 ------ Shared Memory Status --------
 
 test: mesg headers
 ------ Message Queues Send/Recv/Change Times --------
-msqid    owner      send                 recv                 change              
+msqid    owner      send                 recv                 change
 ------ Message Queues PIDs --------
-msqid      owner      lspid      lrpid     
+msqid      owner      lspid      lrpid
 ------ Message Queues: Creators/Owners --------
-msqid      perms      cuid       cgid       uid        gid       
+msqid      perms      cuid       cgid       uid        gid
 ------ Messages: Limits --------
 ------ Messages: Status --------
 
 test: sem headers
 ------ Semaphore Operation/Change Times --------
-semid    owner      last-op                    last-changed              
+semid    owner      last-op                    last-changed
 ------ Semaphore Arrays Creators/Owners --------
-semid      perms      cuid       cgid       uid        gid       
+semid      perms      cuid       cgid       uid        gid
 ------ Semaphore Limits --------
 ------ Semaphore Status --------
 
 test: all headers
 ------ Shared Memory Segments --------
-key        shmid      owner      perms      bytes      nattch     status      
+key        shmid      owner      perms      bytes      nattch     status
 --
 ------ Semaphore Arrays --------
-key        semid      owner      perms      nsems     
+key        semid      owner      perms      nsems
 --
 ------ Message Queues --------
-key        msqid      owner      perms      used-bytes   messages    
+key        msqid      owner      perms      used-bytes   messages
 ------ Shared Memory Attach/Detach/Change Times --------
-shmid      owner      attached             detached             changed             
+shmid      owner      attached             detached             changed
 --
 ------ Semaphore Operation/Change Times --------
-semid    owner      last-op                    last-changed              
+semid    owner      last-op                    last-changed
 --
 ------ Message Queues Send/Recv/Change Times --------
-msqid    owner      send                 recv                 change              
+msqid    owner      send                 recv                 change
 ------ Shared Memory Creator/Last-op --------
-shmid      owner      cpid       lpid      
+shmid      owner      cpid       lpid
 --
 ------ Message Queues PIDs --------
-msqid      owner      lspid      lrpid     
+msqid      owner      lspid      lrpid
 ------ Shared Memory Segment Creators/Owners --------
-shmid      perms      cuid       cgid       uid        gid       
+shmid      perms      cuid       cgid       uid        gid
 --
 ------ Semaphore Arrays Creators/Owners --------
-semid      perms      cuid       cgid       uid        gid       
+semid      perms      cuid       cgid       uid        gid
 --
 ------ Message Queues: Creators/Owners --------
-msqid      perms      cuid       cgid       uid        gid       
+msqid      perms      cuid       cgid       uid        gid
 ------ Shared Memory Limits --------
 ------ Semaphore Limits --------
 ------ Messages: Limits --------

diff --git a/tests/expected/ts-ipcs-limits b/tests/expected/ipcs/limits
similarity index 100%
rename from tests/expected/ts-ipcs-limits
rename to tests/expected/ipcs/limits

diff --git a/tests/expected/ts-ipcs-limits2 b/tests/expected/ipcs/limits2
similarity index 100%
rename from tests/expected/ts-ipcs-limits2
rename to tests/expected/ipcs/limits2

diff --git a/tests/expected/ts-login-checktty b/tests/expected/login/checktty
similarity index 100%
rename from tests/expected/ts-login-checktty
rename to tests/expected/login/checktty

diff --git a/tests/expected/ts-login-islocal b/tests/expected/login/islocal
similarity index 100%
rename from tests/expected/ts-login-islocal
rename to tests/expected/login/islocal

diff --git a/tests/expected/ts-look-separator b/tests/expected/look/separator
similarity index 100%
rename from tests/expected/ts-look-separator
rename to tests/expected/look/separator

diff --git a/tests/expected/ts-fstab-devname b/tests/expected/mount/devname
similarity index 100%
rename from tests/expected/ts-fstab-devname
rename to tests/expected/mount/devname

diff --git a/tests/expected/ts-fstab-devname2label b/tests/expected/mount/fstab-devname
similarity index 100%
rename from tests/expected/ts-fstab-devname2label
rename to tests/expected/mount/fstab-devname

diff --git a/tests/expected/ts-fstab-devname2uuid b/tests/expected/mount/fstab-devname2label
similarity index 100%
rename from tests/expected/ts-fstab-devname2uuid
rename to tests/expected/mount/fstab-devname2label

diff --git a/tests/expected/ts-fstab-label b/tests/expected/mount/fstab-devname2uuid
similarity index 100%
rename from tests/expected/ts-fstab-label
rename to tests/expected/mount/fstab-devname2uuid

diff --git a/tests/expected/ts-fstab-label2devname b/tests/expected/mount/fstab-label
similarity index 100%
rename from tests/expected/ts-fstab-label2devname
rename to tests/expected/mount/fstab-label

diff --git a/tests/expected/ts-fstab-label2uuid b/tests/expected/mount/fstab-label2devname
similarity index 100%
rename from tests/expected/ts-fstab-label2uuid
rename to tests/expected/mount/fstab-label2devname

diff --git a/tests/expected/ts-fstab-symlink b/tests/expected/mount/fstab-label2uuid
similarity index 100%
rename from tests/expected/ts-fstab-symlink
rename to tests/expected/mount/fstab-label2uuid

diff --git a/tests/expected/ts-fstab-uuid b/tests/expected/mount/fstab-symlink
similarity index 100%
rename from tests/expected/ts-fstab-uuid
rename to tests/expected/mount/fstab-symlink

diff --git a/tests/expected/ts-fstab-uuid2devname b/tests/expected/mount/fstab-uuid
similarity index 100%
rename from tests/expected/ts-fstab-uuid2devname
rename to tests/expected/mount/fstab-uuid

diff --git a/tests/expected/ts-fstab-uuid2label b/tests/expected/mount/fstab-uuid2devname
similarity index 100%
rename from tests/expected/ts-fstab-uuid2label
rename to tests/expected/mount/fstab-uuid2devname

diff --git a/tests/expected/ts-mount-devname b/tests/expected/mount/fstab-uuid2label
similarity index 100%
rename from tests/expected/ts-mount-devname
rename to tests/expected/mount/fstab-uuid2label

diff --git a/tests/expected/ts-mount-label b/tests/expected/mount/label
similarity index 100%
rename from tests/expected/ts-mount-label
rename to tests/expected/mount/label

diff --git a/tests/expected/ts-mount-move b/tests/expected/mount/move
similarity index 100%
rename from tests/expected/ts-mount-move
rename to tests/expected/mount/move

diff --git a/tests/expected/ts-mount-mtablock b/tests/expected/mount/mtablock
similarity index 100%
rename from tests/expected/ts-mount-mtablock
rename to tests/expected/mount/mtablock

diff --git a/tests/expected/ts-mount-noncanonical b/tests/expected/mount/noncanonical
similarity index 100%
rename from tests/expected/ts-mount-noncanonical
rename to tests/expected/mount/noncanonical

diff --git a/tests/expected/ts-mount-paths b/tests/expected/mount/paths
similarity index 100%
rename from tests/expected/ts-mount-paths
rename to tests/expected/mount/paths

diff --git a/tests/expected/ts-mount-remount b/tests/expected/mount/remount
similarity index 100%
rename from tests/expected/ts-mount-remount
rename to tests/expected/mount/remount

diff --git a/tests/expected/ts-mount-special b/tests/expected/mount/special
similarity index 100%
rename from tests/expected/ts-mount-special
rename to tests/expected/mount/special

diff --git a/tests/expected/ts-mount-uuid b/tests/expected/mount/uuid
similarity index 100%
rename from tests/expected/ts-mount-uuid
rename to tests/expected/mount/uuid

diff --git a/tests/expected/ts-namei-logic b/tests/expected/namei/logic
similarity index 100%
rename from tests/expected/ts-namei-logic
rename to tests/expected/namei/logic

diff --git a/tests/expected/ts-include-pathnames b/tests/expected/paths/built-in
similarity index 100%
rename from tests/expected/ts-include-pathnames
rename to tests/expected/paths/built-in

diff --git a/tests/expected/ts-script-race b/tests/expected/script/race
similarity index 100%
rename from tests/expected/ts-script-race
rename to tests/expected/script/race

diff --git a/tests/expected/ts-swapon-devname b/tests/expected/swapon/devname
similarity index 100%
rename from tests/expected/ts-swapon-devname
rename to tests/expected/swapon/devname

diff --git a/tests/expected/ts-swapon-label b/tests/expected/swapon/label
similarity index 100%
rename from tests/expected/ts-swapon-label
rename to tests/expected/swapon/label

diff --git a/tests/expected/ts-swapon-uuid b/tests/expected/swapon/uuid
similarity index 100%
rename from tests/expected/ts-swapon-uuid
rename to tests/expected/swapon/uuid