commit aa3220d5f441ab306a44b883d1ae8639bc51db3f
parent 7382d4635267518270a44a2e839de182c72c1b36
Author: Andreas Guldstrand <andreas.guldstrand@gmail.com>
Date: Thu, 7 Jul 2016 00:04:15 +0200
07-fail.t: only run the compat32 malformed readme test when TEST_MULTILIB=2 and the relevant tools exist
Diffstat:
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git 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 {