Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Fix tests if jailed
Baptiste Daroussin committed 11 years ago
commit 64414271e941f1e9cf64a6837c3ee56e2d748ec8
parent cd1c196
1 file changed +13 -10
modified tests/frontend/conflicts.shin
@@ -68,10 +68,13 @@ local: {
}
EOF

-
	cat << EOF >> output.txt
-
Updating local repository catalogue...
-
Fetching meta.txz... done
-
Fetching packagesite.txz... done
+
	jailed=$(sysctl -n security.jail.jailed || :)
+
	if [ "$jailed" = "1" ]; then
+
		JAILED="[`hostname`] "
+
	fi
+
OUTPUT="Updating local repository catalogue...
+
${JAILED}Fetching meta.txz... done
+
${JAILED}Fetching packagesite.txz... done
Processing entries... done
local repository update completed. 1 packages processed.
Updating database digests format... done
@@ -84,13 +87,13 @@ Installed packages to be REMOVED:

New packages to be INSTALLED:
	test2: 1
-
[1/2] Deinstalling test-1...
-
[1/2] Deleting files for test-1... done
-
[2/2] Installing test2-1...
-
[2/2] Extracting test2-1... done
-
EOF
+
${JAILED}[1/2] Deinstalling test-1...
+
${JAILED}[1/2] Deleting files for test-1... done
+
${JAILED}[2/2] Installing test2-1...
+
${JAILED}[2/2] Extracting test2-1... done
+
"
	atf_check \
-
		-o file:output.txt \
+
		-o inline:"${OUTPUT}" \
		-e empty \
		-s exit:0 \
		pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -y test2-1