summaryrefslogtreecommitdiffstats
path: root/test/Configure
diff options
context:
space:
mode:
Diffstat (limited to 'test/Configure')
-rw-r--r--test/Configure/clean.py8
-rw-r--r--test/Configure/help.py12
2 files changed, 10 insertions, 10 deletions
diff --git a/test/Configure/clean.py b/test/Configure/clean.py
index a6ba7c1..3fcfcbd 100644
--- a/test/Configure/clean.py
+++ b/test/Configure/clean.py
@@ -66,15 +66,15 @@ lines = [
]
test.run(arguments = '-c clean=0')
-test.must_not_contain_lines(lines, test.stdout())
+test.must_not_contain_any_line(test.stdout(), lines)
test.run(arguments = '-c clean=1')
-test.must_contain_lines(lines, test.stdout())
+test.must_contain_all_lines(test.stdout(), lines)
test.run(arguments = '--clean clean=0')
-test.must_not_contain_lines(lines, test.stdout())
+test.must_not_contain_any_line(test.stdout(), lines)
test.run(arguments = '--clean clean=1')
-test.must_contain_lines(lines, test.stdout())
+test.must_contain_all_lines(test.stdout(), lines)
test.pass_test()
diff --git a/test/Configure/help.py b/test/Configure/help.py
index 32c68eb..9f58513 100644
--- a/test/Configure/help.py
+++ b/test/Configure/help.py
@@ -68,23 +68,23 @@ lines = [
# The help setting should have no effect on -H, so the -H output
# should never contain the lines.
test.run(arguments = '-H help=0')
-test.must_not_contain_lines(lines, test.stdout())
+test.must_not_contain_any_line(test.stdout(), lines)
test.run(arguments = '-H help=1')
-test.must_not_contain_lines(lines, test.stdout())
+test.must_not_contain_any_line(test.stdout(), lines)
# For -h and --help, the lines appear or not depending on how Configure()
# is initialized.
test.run(arguments = '-h help=0')
-test.must_not_contain_lines(lines, test.stdout())
+test.must_not_contain_any_line(test.stdout(), lines)
test.run(arguments = '-h help=1')
-test.must_contain_lines(lines, test.stdout())
+test.must_contain_all_lines(test.stdout(), lines)
test.run(arguments = '--help help=0')
-test.must_not_contain_lines(lines, test.stdout())
+test.must_not_contain_any_line(test.stdout(), lines)
test.run(arguments = '--help help=1')
-test.must_contain_lines(lines, test.stdout())
+test.must_contain_all_lines(test.stdout(), lines)
test.pass_test()