aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Guldstrand <andreas.guldstrand@gmail.com>2015-12-31 22:39:29 +0100
committerAndreas Guldstrand <andreas.guldstrand@gmail.com>2015-12-31 22:52:46 +0100
commit31e359c72531265b6b465a8dc68b2284a0f50810 (patch)
treef8690c2cdb1c1e3ee63dd8b558a7e80af3a07f7d
parent4ac02fbe711fc3ec9ac2a29767af02ae852b2703 (diff)
downloadsbotools2-31e359c72531265b6b465a8dc68b2284a0f50810.tar.xz
Fix test.t when multilib is only partially enabled
-rwxr-xr-xt/test.t11
1 files changed, 7 insertions, 4 deletions
diff --git a/t/test.t b/t/test.t
index eca6945..ee7e1fb 100755
--- a/t/test.t
+++ b/t/test.t
@@ -254,10 +254,13 @@ ok(!(check_x32("$repo_path/system/ifuse")),
'check_x32 false for not-32-bit-only ifuse');
# 36: check_multilib tests
-if (-x '/usr/sbin/convertpkg-compat32') {
- ok(check_multilib(), 'check_multilib good');
-} else {
- ok(!check_multilib(), 'check_multilib good');
+SKIP: {
+ skip "This is useless to test if TEST_MULTILIB=1", 1 if ($ENV{TEST_MULTILIB} // 0) == 1;
+ if (-x '/usr/sbin/convertpkg-compat32') {
+ ok(check_multilib(), 'check_multilib good');
+ } else {
+ ok(!check_multilib(), 'check_multilib good');
+ }
}
# 37: create_symlinks tests