From 24de87489ef186aa73cf74a71fcfa04188368754 Mon Sep 17 00:00:00 2001 From: d4wnr4z0r Date: Wed, 27 Nov 2013 12:28:01 -0600 Subject: support 14.1, test version/multilib as appropriately for system --- t/test.t | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 't/test.t') diff --git a/t/test.t b/t/test.t index 52524f4..07b8704 100755 --- a/t/test.t +++ b/t/test.t @@ -39,7 +39,13 @@ ok(defined $tempdir, '$tempdir is defined'); is(show_version, 1, 'show_version is good'); # get_slack_version test -is(get_slack_version, '14.0', 'get_slack_version is good'); +my $version = 0; +if (-f '/etc/slackware-version') { + $version = `awk '{print \$2}' /etc/slackware-version`; + chomp($version); +} +$version = '14.1' unless $version; +is(get_slack_version, $version, 'get_slack_version is good'); # chk_slackbuilds_txt tests is(chk_slackbuilds_txt, 1, 'chk_slackbuilds_txt is good'); @@ -182,7 +188,11 @@ ok(!(check_x32("$sbo_home/system/ifuse")), 'check_x32 false for not-32-bit-only ifuse'); # check_multilib tests -ok(check_multilib, 'check_multilib good'); +if (-x '/usr/sbin/convertpkg-compat32') { + ok(check_multilib, 'check_multilib good'); +} else { + ok(!check_multilib, 'check_multilib good'); +} # create_symlinks tests $downloads = get_sbo_downloads(LOCATION => "$sbo_home/system/wine", 32 => 1); -- cgit v1.2.3