Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/freebsd/poudriere.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorBryan Drewery <bryan@shatow.net>2019-08-03 20:40:19 +0300
committerBryan Drewery <bryan@shatow.net>2019-08-03 20:40:19 +0300
commit0a50192f824900602ed1f14e632c286cc31d7b50 (patch)
treea63e11487b19679fc5e8bd663a4acdb5c55740f8 /test
parent55f3f967c54f65179c206aa645da15fe8e043833 (diff)
IGNORE: Keep ignored/skipped packages in the .ports.queued/HTML queued list.
Diffstat (limited to 'test')
-rw-r--r--test/bulk-flavor-ignore-all.sh2
-rw-r--r--test/bulk-ignore-and-skipped.sh2
-rw-r--r--test/bulk-ignore-dep-skipped.sh2
-rw-r--r--test/bulk-ignore-listed-dep.sh2
-rw-r--r--test/bulk-ignore-listed-skipped-dep.sh2
-rw-r--r--test/bulk-ignore-listed.sh2
6 files changed, 6 insertions, 6 deletions
diff --git a/test/bulk-flavor-ignore-all.sh b/test/bulk-flavor-ignore-all.sh
index b8241e09..f12d7a4a 100644
--- a/test/bulk-flavor-ignore-all.sh
+++ b/test/bulk-flavor-ignore-all.sh
@@ -20,7 +20,7 @@ assert "ports-mgmt/poudriere-devel-dep-IGNORED ports-mgmt/poudriere-devel-dep2-I
assert_ignored "${IGNOREDPORTS}"
# Assert that only listed packages are in poudriere.ports.queued as 'listed'
-assert_queued "listed" "${LISTPORTS_NOIGNORED}"
+assert_queued "listed" "${LISTPORTS}"
# Assert the IGNOREd ports are tracked in .poudriere.ports.ignored
assert_ignored "${IGNOREDPORTS}"
diff --git a/test/bulk-ignore-and-skipped.sh b/test/bulk-ignore-and-skipped.sh
index b55da94d..ad991581 100644
--- a/test/bulk-ignore-and-skipped.sh
+++ b/test/bulk-ignore-and-skipped.sh
@@ -21,7 +21,7 @@ assert "ports-mgmt/poudriere-devel-IGNORED-and-skipped ports-mgmt/poudriere-deve
assert "" "${SKIPPEDPORTS-null}" "SKIPPEDPORTS should match"
# Assert that only listed packages are in poudriere.ports.queued as 'listed'
-assert_queued "listed" "${LISTPORTS_NOIGNORED}"
+assert_queued "listed" "${LISTPORTS}"
# Assert the IGNOREd ports are tracked in .poudriere.ports.ignored
assert_ignored "${IGNOREDPORTS}"
diff --git a/test/bulk-ignore-dep-skipped.sh b/test/bulk-ignore-dep-skipped.sh
index cbca1044..aa1e6acc 100644
--- a/test/bulk-ignore-dep-skipped.sh
+++ b/test/bulk-ignore-dep-skipped.sh
@@ -25,7 +25,7 @@ assert "ports-mgmt/poudriere-devel-IGNORED" \
assert "ports-mgmt/poudriere-devel-dep-IGNORED" "${SKIPPEDPORTS-null}" "SKIPPEDPORTS should match"
# Assert that only listed packages are in poudriere.ports.queued as 'listed'
-assert_queued "listed" "${LISTPORTS_NOIGNORED}"
+assert_queued "listed" "${LISTPORTS}"
# Assert the IGNOREd ports are tracked in .poudriere.ports.ignored
assert_ignored "${IGNOREDPORTS}"
diff --git a/test/bulk-ignore-listed-dep.sh b/test/bulk-ignore-listed-dep.sh
index 1769d033..d37594a9 100644
--- a/test/bulk-ignore-listed-dep.sh
+++ b/test/bulk-ignore-listed-dep.sh
@@ -23,7 +23,7 @@ assert "ports-mgmt/poudriere-devel-IGNORED" \
assert "" "${SKIPPEDPORTS-null}" "SKIPPEDPORTS should match"
# Assert that only listed packages are in poudriere.ports.queued as 'listed'
-assert_queued "listed" "${LISTPORTS_NOIGNORED}"
+assert_queued "listed" "${LISTPORTS}"
# Assert the IGNOREd ports are tracked in .poudriere.ports.ignored
assert_ignored "${IGNOREDPORTS}"
diff --git a/test/bulk-ignore-listed-skipped-dep.sh b/test/bulk-ignore-listed-skipped-dep.sh
index d807f19b..e922d7b3 100644
--- a/test/bulk-ignore-listed-skipped-dep.sh
+++ b/test/bulk-ignore-listed-skipped-dep.sh
@@ -25,7 +25,7 @@ assert "ports-mgmt/poudriere-devel-IGNORED" \
assert "ports-mgmt/poudriere-devel-dep-IGNORED" "${SKIPPEDPORTS-null}" "SKIPPEDPORTS should match"
# Assert that only listed packages are in poudriere.ports.queued as 'listed'
-assert_queued "listed" "${LISTPORTS_NOIGNORED}"
+assert_queued "listed" "${LISTPORTS}"
# Assert the IGNOREd ports are tracked in .poudriere.ports.ignored
assert_ignored "${IGNOREDPORTS}"
diff --git a/test/bulk-ignore-listed.sh b/test/bulk-ignore-listed.sh
index e69b031f..ec93a7fb 100644
--- a/test/bulk-ignore-listed.sh
+++ b/test/bulk-ignore-listed.sh
@@ -28,7 +28,7 @@ assert_ignored "${IGNOREDPORTS}"
assert_skipped "${SKIPPEDPORTS}"
# Assert that only listed packages are in poudriere.ports.queued as 'listed'
-assert_queued "listed" "${LISTPORTS_NOIGNORED}"
+assert_queued "listed" "${LISTPORTS}"
# Assert that all expected dependencies are in poudriere.ports.queued (since
# they do not exist yet)