From 2ab71dc62a85985e76bbf8b94838cdd4d6105128 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 28 Jun 2014 12:23:45 -0400
Subject: test/librechroot: work-around for a systemd bug

---
 test/librechroot-test.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/test/librechroot-test.sh b/test/librechroot-test.sh
index 43f3143..c3026da 100644
--- a/test/librechroot-test.sh
+++ b/test/librechroot-test.sh
@@ -41,7 +41,15 @@ it_respects_exit_status_if_out_isnt_a_tty() (
 	libremessages msg 'Creating a chroot, may take a few minutes' &>/dev/tty
 	r=0
 	{ testsudo librechroot -l "$roundup_test_name" run bash -c 'exit 3' | cat; } || r=$?
-	[[ $r == 3 ]]
+
+	# Work around http://lists.freedesktop.org/archives/systemd-devel/2014-June/020685.html
+	# Hopefully the fix gets merged for 215
+	systemd_ver=$(systemd-nspawn --version|sed -n 's|^systemd ||p')
+	if [[ $systemd_ver =~ 213|214 ]]; then
+		[[ $r == 1 ]]
+	else
+		[[ $r == 3 ]]
+	fi
 )
 
 it_creates_ca_certificates() {
-- 
cgit v1.2.2