Merge pull request #1671 from okurz/feature/gcc48_only_binary

check_gcc48_on_sdk_in_aarch64: Only search binary packages; Only check SDK if it is available (bsc#991508)

tests/console/check_gcc48_on_sdk_in_aarch64.pm

@@ -11,15 +11,22 @@ use base "consoletest";
 use strict;
 use testapi;
 
-# fate#320678 GCC 4.8 on SDK for AArch64
+# Maintainer: okurz@suse.de
+# Summary: fate#320678 GCC 4.8 on SDK for AArch64
 sub run() {
     select_console 'user-console';
+    my $not_repo = 'SLE';
     my $repo     = 'SDK';
     my @packages = qw/gcc48 gcc48-c++ gcc48-fortran gcc48-info gcc48-locale gcc48-objc gcc48-obj-c++ libstdc++48-devel/;
     for my $package (@packages) {
-        diag "checking package $package";
-        assert_script_run('zypper search --details ' . $package);
-        assert_script_run('zypper search --details ' . $package . ' | grep \'\<' . $package . '\>\s\+.*' . $repo . '\'');
+        diag "checking package $package (only binary packages)";
+        assert_script_run('zypper search -t package --details ' . $package);
+        diag "checking package $package is *not* in repo \'$not_repo\'";
+        assert_script_run('! zypper search -t package --details ' . $package . ' | grep \'\<' . $package . '\>\s\+.*' . $not_repo . '\'');
+        if (get_var('ADDONS', '') =~ /sdk/) {
+            diag "checking package $package *is* in repo \'$repo\'";
+            assert_script_run('zypper search -t package --details ' . $package . ' | grep \'\<' . $package . '\>\s\+.*' . $repo . '\'');
+        }
     }
 }