Module Name: src Committed By: gutteridge Date: Mon Apr 3 16:26:50 UTC 2023
Modified Files: src/external/bsd/atf/dist/tools: atf-run_test.sh Log Message: atf-run_test.sh: fix spelling of "through" Reported by Jim Spath in PR misc/57318. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/atf/dist/tools/atf-run_test.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/bsd/atf/dist/tools/atf-run_test.sh diff -u src/external/bsd/atf/dist/tools/atf-run_test.sh:1.1.1.1 src/external/bsd/atf/dist/tools/atf-run_test.sh:1.2 --- src/external/bsd/atf/dist/tools/atf-run_test.sh:1.1.1.1 Sat Feb 8 19:11:34 2014 +++ src/external/bsd/atf/dist/tools/atf-run_test.sh Mon Apr 3 16:26:50 2023 @@ -219,11 +219,11 @@ vflag_body() atf_check -s eq:1 -o ignore -e ignore -x \ "ATF_CONFDIR=$(pwd)/etc atf-run helper" - echo "Checking that defining 'testvar' trough '-v' works." + echo "Checking that defining 'testvar' through '-v' works." atf_check -s eq:0 -o match:'testvar: a value' -e ignore -x \ "ATF_CONFDIR=$(pwd)/etc atf-run -v testvar='a value' helper" - echo "Checking that defining 'testvar' trough the configuration" \ + echo "Checking that defining 'testvar' through the configuration" \ "file works." mkdir etc cat >etc/common.conf <<EOF @@ -234,7 +234,7 @@ EOF atf_check -s eq:0 -o match:'testvar: value in conf file' -e ignore -x \ "ATF_CONFDIR=$(pwd)/etc atf-run helper" - echo "Checking that defining 'testvar' trough -v overrides the" \ + echo "Checking that defining 'testvar' through -v overrides the" \ "configuration file." atf_check -s eq:0 -o match:'testvar: a value' -e ignore -x \ "ATF_CONFDIR=$(pwd)/etc atf-run -v testvar='a value' helper" @@ -254,12 +254,12 @@ atffile_body() atf_check -s eq:1 -o ignore -e ignore -x \ "ATF_CONFDIR=$(pwd)/etc atf-run helper" - echo "Checking that defining 'testvar' trough the Atffile works." + echo "Checking that defining 'testvar' through the Atffile works." echo 'conf: testvar = "a value"' >>Atffile atf_check -s eq:0 -o match:'testvar: a value' -e ignore -x \ "ATF_CONFDIR=$(pwd)/etc atf-run helper" - echo "Checking that defining 'testvar' trough the configuration" \ + echo "Checking that defining 'testvar' through the configuration" \ "file overrides the one in the Atffile." mkdir etc cat >etc/common.conf <<EOF @@ -271,7 +271,7 @@ EOF "ATF_CONFDIR=$(pwd)/etc atf-run helper" rm -rf etc - echo "Checking that defining 'testvar' trough -v overrides the" \ + echo "Checking that defining 'testvar' through -v overrides the" \ "one in the Atffile." atf_check -s eq:0 -o match:'testvar: new value' -e ignore -x \ "ATF_CONFDIR=$(pwd)/etc atf-run -v testvar='new value' helper"