summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@tavianator.com>2019-03-17 15:09:41 -0600
committerTavian Barnes <tavianator@tavianator.com>2019-03-17 15:09:41 -0600
commit1609a505e6a6ee2730c8ad15d145335f81204bb1 (patch)
treeb6db7bdd5138a4944c575ef7a84080efe0e0bf53
parent8ee6de6dd8376a3c087e94fe32d1b6e97a44a862 (diff)
downloadbfs-1609a505e6a6ee2730c8ad15d145335f81204bb1.tar.xz
tests: Use archive extensions for color tests
-rwxr-xr-xtests.sh5
-rw-r--r--tests/test_color.out3
-rw-r--r--tests/test_color_L.out3
-rw-r--r--tests/test_color_ext.out3
-rw-r--r--tests/test_color_ext0.out3
-rw-r--r--tests/test_color_ext_override.out7
-rw-r--r--tests/test_color_ext_underride.out7
-rw-r--r--tests/test_color_mh.out3
-rw-r--r--tests/test_color_mh0.out3
-rw-r--r--tests/test_color_mi.out3
-rw-r--r--tests/test_color_missing_colon.out3
-rw-r--r--tests/test_color_or.out3
-rw-r--r--tests/test_color_or0_mi.out3
-rw-r--r--tests/test_color_or0_mi0.out3
-rw-r--r--tests/test_color_or_mi.out3
-rw-r--r--tests/test_color_or_mi0.out3
-rw-r--r--tests/test_color_st0_tw0_ow.out3
-rw-r--r--tests/test_color_st0_tw0_ow0.out3
-rw-r--r--tests/test_color_st0_tw_ow.out3
-rw-r--r--tests/test_color_st0_tw_ow0.out3
-rw-r--r--tests/test_color_st_tw0_ow.out3
-rw-r--r--tests/test_color_st_tw0_ow0.out3
-rw-r--r--tests/test_color_st_tw_ow0.out3
-rw-r--r--tests/test_color_su0_sg.out3
-rw-r--r--tests/test_color_su0_sg0.out3
-rw-r--r--tests/test_color_su_sg0.out3
26 files changed, 82 insertions, 6 deletions
diff --git a/tests.sh b/tests.sh
index 05a3457..3576f7a 100755
--- a/tests.sh
+++ b/tests.sh
@@ -180,6 +180,7 @@ make_deep "$TMP/deep"
function make_rainbow() {
touchp "$1/file.txt"
touchp "$1/file.dat"
+ touchp "$1/star".{gz,tar,tar.gz}
ln -s file.txt "$1/link.txt"
touchp "$1/mh1"
ln "$1/mh1" "$1/mh2"
@@ -1924,11 +1925,11 @@ function test_color_ext0() {
}
function test_color_ext_override() {
- LS_COLORS="*.txt=01;31:*t=01;33:" bfs_diff rainbow -color
+ LS_COLORS="*.tar.gz=01;31:*.tar=01;32:*.gz=01;33:" bfs_diff rainbow -color
}
function test_color_ext_underride() {
- LS_COLORS="*t=01;33:*.txt=01;31:" bfs_diff rainbow -color
+ LS_COLORS="*.gz=01;33:*.tar=01;32:*.tar.gz=01;31:" bfs_diff rainbow -color
}
function test_color_missing_colon() {
diff --git a/tests/test_color.out b/tests/test_color.out
index 98d459f..77fc8a8 100644
--- a/tests/test_color.out
+++ b/tests/test_color.out
@@ -15,3 +15,6 @@
rainbow/file.txt
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_L.out b/tests/test_color_L.out
index b93716f..b60dd4a 100644
--- a/tests/test_color_L.out
+++ b/tests/test_color_L.out
@@ -15,3 +15,6 @@
rainbow/link.txt
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_ext.out b/tests/test_color_ext.out
index fff32ef..cf26e73 100644
--- a/tests/test_color_ext.out
+++ b/tests/test_color_ext.out
@@ -15,3 +15,6 @@
rainbow/file.dat
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_ext0.out b/tests/test_color_ext0.out
index c9bc052..e764a6b 100644
--- a/tests/test_color_ext0.out
+++ b/tests/test_color_ext0.out
@@ -15,3 +15,6 @@
rainbow/file.dat
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_ext_override.out b/tests/test_color_ext_override.out
index cd3231d..1377b65 100644
--- a/tests/test_color_ext_override.out
+++ b/tests/test_color_ext_override.out
@@ -1,7 +1,8 @@
rainbow
rainbow/exec.sh
-rainbow/file.dat
-rainbow/file.txt
+rainbow/star.tar
+rainbow/star.gz
+rainbow/star.tar.gz
rainbow/socket
rainbow/broken
rainbow/chardev_link
@@ -13,5 +14,7 @@
rainbow/sugid
rainbow/suid
rainbow/sticky
+rainbow/file.dat
+rainbow/file.txt
rainbow/mh1
rainbow/mh2
diff --git a/tests/test_color_ext_underride.out b/tests/test_color_ext_underride.out
index 127cc66..787248a 100644
--- a/tests/test_color_ext_underride.out
+++ b/tests/test_color_ext_underride.out
@@ -1,7 +1,8 @@
rainbow
-rainbow/file.txt
+rainbow/star.tar.gz
rainbow/exec.sh
-rainbow/file.dat
+rainbow/star.tar
+rainbow/star.gz
rainbow/socket
rainbow/broken
rainbow/chardev_link
@@ -13,5 +14,7 @@
rainbow/sugid
rainbow/suid
rainbow/sticky
+rainbow/file.dat
+rainbow/file.txt
rainbow/mh1
rainbow/mh2
diff --git a/tests/test_color_mh.out b/tests/test_color_mh.out
index 4651cf1..757a6a1 100644
--- a/tests/test_color_mh.out
+++ b/tests/test_color_mh.out
@@ -15,3 +15,6 @@
rainbow/sticky
rainbow/file.dat
rainbow/file.txt
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_mh0.out b/tests/test_color_mh0.out
index 98d459f..77fc8a8 100644
--- a/tests/test_color_mh0.out
+++ b/tests/test_color_mh0.out
@@ -15,3 +15,6 @@
rainbow/file.txt
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_mi.out b/tests/test_color_mi.out
index 98d459f..77fc8a8 100644
--- a/tests/test_color_mi.out
+++ b/tests/test_color_mi.out
@@ -15,3 +15,6 @@
rainbow/file.txt
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_missing_colon.out b/tests/test_color_missing_colon.out
index fff32ef..cf26e73 100644
--- a/tests/test_color_missing_colon.out
+++ b/tests/test_color_missing_colon.out
@@ -15,3 +15,6 @@
rainbow/file.dat
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_or.out b/tests/test_color_or.out
index 4668cc0..9e1fe5c 100644
--- a/tests/test_color_or.out
+++ b/tests/test_color_or.out
@@ -15,3 +15,6 @@
rainbow/file.txt
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_or0_mi.out b/tests/test_color_or0_mi.out
index 98d459f..77fc8a8 100644
--- a/tests/test_color_or0_mi.out
+++ b/tests/test_color_or0_mi.out
@@ -15,3 +15,6 @@
rainbow/file.txt
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_or0_mi0.out b/tests/test_color_or0_mi0.out
index 98d459f..77fc8a8 100644
--- a/tests/test_color_or0_mi0.out
+++ b/tests/test_color_or0_mi0.out
@@ -15,3 +15,6 @@
rainbow/file.txt
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_or_mi.out b/tests/test_color_or_mi.out
index 8bf605e..5667f56 100644
--- a/tests/test_color_or_mi.out
+++ b/tests/test_color_or_mi.out
@@ -15,3 +15,6 @@
rainbow/file.txt
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_or_mi0.out b/tests/test_color_or_mi0.out
index 8bf605e..5667f56 100644
--- a/tests/test_color_or_mi0.out
+++ b/tests/test_color_or_mi0.out
@@ -15,3 +15,6 @@
rainbow/file.txt
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_st0_tw0_ow.out b/tests/test_color_st0_tw0_ow.out
index 51ca9d2..9a47ef2 100644
--- a/tests/test_color_st0_tw0_ow.out
+++ b/tests/test_color_st0_tw0_ow.out
@@ -15,3 +15,6 @@
rainbow/file.txt
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_st0_tw0_ow0.out b/tests/test_color_st0_tw0_ow0.out
index e86ae35..2b86fe4 100644
--- a/tests/test_color_st0_tw0_ow0.out
+++ b/tests/test_color_st0_tw0_ow0.out
@@ -15,3 +15,6 @@
rainbow/file.txt
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_st0_tw_ow.out b/tests/test_color_st0_tw_ow.out
index efb7b39..42549a1 100644
--- a/tests/test_color_st0_tw_ow.out
+++ b/tests/test_color_st0_tw_ow.out
@@ -15,3 +15,6 @@
rainbow/file.txt
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_st0_tw_ow0.out b/tests/test_color_st0_tw_ow0.out
index 16c6f53..535b8ae 100644
--- a/tests/test_color_st0_tw_ow0.out
+++ b/tests/test_color_st0_tw_ow0.out
@@ -15,3 +15,6 @@
rainbow/file.txt
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_st_tw0_ow.out b/tests/test_color_st_tw0_ow.out
index 6c2346c..c9a86f4 100644
--- a/tests/test_color_st_tw0_ow.out
+++ b/tests/test_color_st_tw0_ow.out
@@ -15,3 +15,6 @@
rainbow/file.txt
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_st_tw0_ow0.out b/tests/test_color_st_tw0_ow0.out
index 242622d..2d94f3a 100644
--- a/tests/test_color_st_tw0_ow0.out
+++ b/tests/test_color_st_tw0_ow0.out
@@ -15,3 +15,6 @@
rainbow/file.txt
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_st_tw_ow0.out b/tests/test_color_st_tw_ow0.out
index c3b5af1..317ef90 100644
--- a/tests/test_color_st_tw_ow0.out
+++ b/tests/test_color_st_tw_ow0.out
@@ -15,3 +15,6 @@
rainbow/file.txt
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
diff --git a/tests/test_color_su0_sg.out b/tests/test_color_su0_sg.out
index 510c431..8b8c8b8 100644
--- a/tests/test_color_su0_sg.out
+++ b/tests/test_color_su0_sg.out
@@ -14,4 +14,7 @@
rainbow/file.txt
rainbow/mh1
rainbow/mh2
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
rainbow/suid
diff --git a/tests/test_color_su0_sg0.out b/tests/test_color_su0_sg0.out
index d018c2a..0cd5f9a 100644
--- a/tests/test_color_su0_sg0.out
+++ b/tests/test_color_su0_sg0.out
@@ -13,5 +13,8 @@
rainbow/mh1
rainbow/mh2
rainbow/sgid
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz
rainbow/sugid
rainbow/suid
diff --git a/tests/test_color_su_sg0.out b/tests/test_color_su_sg0.out
index dffb3c5..a9e8c5d 100644
--- a/tests/test_color_su_sg0.out
+++ b/tests/test_color_su_sg0.out
@@ -15,3 +15,6 @@
rainbow/mh1
rainbow/mh2
rainbow/sgid
+rainbow/star.gz
+rainbow/star.tar
+rainbow/star.tar.gz