aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Guldstrand <andreas.guldstrand@gmail.com>2016-07-07 00:04:15 +0200
committerAndreas Guldstrand <andreas.guldstrand@gmail.com>2016-07-07 00:04:15 +0200
commitaa3220d5f441ab306a44b883d1ae8639bc51db3f (patch)
treea5790b65a339b5ff935d6d873037e21596ccb60b
parent7382d4635267518270a44a2e839de182c72c1b36 (diff)
downloadsbotools2-aa3220d5f441ab306a44b883d1ae8639bc51db3f.tar.xz
07-fail.t: only run the compat32 malformed readme test when TEST_MULTILIB=2 and the relevant tools exist
-rwxr-xr-xt/07-fail.t8
1 files changed, 7 insertions, 1 deletions
diff --git a/t/07-fail.t b/t/07-fail.t
index 09a17cc..6cba053 100755
--- a/t/07-fail.t
+++ b/t/07-fail.t
@@ -198,7 +198,13 @@ END
}
# 26: compat32 for malformed-readme fail
-sboinstall qw/ -p malformed-readme /, { exit => 2, expected => qr!A fatal script error has occurred:\nopen_fh, .*t/LO-fail/malformed-readme/README is not a file! };
+SKIP: {
+ skip "Multilib convertpkg fail test only valid if TEST_MULTILIB=2", 1 unless $ENV{TEST_MULTILIB} == 2;
+ skip "No /etc/profile.d/32dev.sh", 1 unless -e "/etc/profile.d/32dev.sh";
+ skip "No /usr/sbin/convertpkg-compat32", 1 unless -e "/usr/sbin/convertpkg-compat32";
+
+ sboinstall qw/ -p malformed-readme /, { exit => 2, expected => qr!A fatal script error has occurred:\nopen_fh, .*t/LO-fail/malformed-readme/README is not a file! };
+}
# Cleanup
END {