Rename tests/*/group to tests/*/rc

The following change is going to add an explicit source of these to the
tests themselves, and this naming makes more sense in that context.

Signed-off-by: Omar Sandoval <osandov@fb.com>

diff --git a/Makefile b/Makefile
index 24e0ce166e8dae3dfe4e9c5b092cdeb876a5c423..e3c379f64568c63208b72c15cbce28361d4c37b0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ SHELLCHECK_EXCLUDE := SC2034,SC2119
 
 check:
        shellcheck -x -e $(SHELLCHECK_EXCLUDE) -f gcc check new common/* \
-               tests/*/group tests/*/[0-9]*[0-9]
+               tests/*/rc tests/*/[0-9]*[0-9]
        ! grep TODO tests/*/[0-9]*[0-9]
 
 .PHONY: all check

diff --git a/check b/check
index 99f64b672f964f59b616389ad73cda508a0b1401..afd0dcc3e36957174cff31b9999248cca08319ca 100755 (executable)
--- a/check
+++ b/check
@@ -93,7 +93,7 @@ _find_tests() {
                        if [[ $group_path != tests/meta ]]; then
                                _found_group "${group_path#tests/}" 0
                        fi
-               done < <(find tests -mindepth 2 -type f -name group -printf '%h\0')
+               done < <(find tests -mindepth 2 -type f -name rc -printf '%h\0')
        else
                local filter
                for filter in "$@"; do
@@ -438,7 +438,7 @@ _run_group() {
        local group="${tests["0"]%/*}"
 
        # shellcheck disable=SC1090
-       . "tests/${group}/group"
+       . "tests/${group}/rc"
 
        if declare -fF group_requires >/dev/null && ! group_requires; then
                _output_notrun "${group}/***"

diff --git a/new b/new
index 923d6b7379861763c38f3a0188a62d4d46958b70..1cd3233b0fa7ae1e351c51979f78001675badc74 100755 (executable)
--- a/new
+++ b/new
@@ -64,7 +64,7 @@ if [[ ! -e tests/${group} ]]; then
                exit 1
        fi
        mkdir -p "tests/${group}"
-       cat << EOF > "tests/${group}/group"
+       cat << EOF > "tests/${group}/rc"
 #!/bin/bash
 #
 # TODO: provide a brief description of the group here.
@@ -118,7 +118,7 @@ group_requires() {
 #      _test_dev_is_foo && _test_dev_supports_bar
 # }
 EOF
-       echo "Created tests/${group}/group"
+       echo "Created tests/${group}/rc"
 fi
 
 for ((i = 1; ; i++)); do

diff --git a/tests/block/group b/tests/block/rc
similarity index 100%
rename from tests/block/group
rename to tests/block/rc

diff --git a/tests/loop/group b/tests/loop/rc
similarity index 100%
rename from tests/loop/group
rename to tests/loop/rc

diff --git a/tests/meta/group b/tests/meta/rc
similarity index 100%
rename from tests/meta/group
rename to tests/meta/rc

diff --git a/tests/nbd/group b/tests/nbd/rc
similarity index 100%
rename from tests/nbd/group
rename to tests/nbd/rc

diff --git a/tests/nvme/group b/tests/nvme/rc
similarity index 100%
rename from tests/nvme/group
rename to tests/nvme/rc

diff --git a/tests/scsi/group b/tests/scsi/rc
similarity index 100%
rename from tests/scsi/group
rename to tests/scsi/rc