[SCM] ci-tooling packaging branch, master, updated. 6c134059d1383fa6f158ca5a6e5cc0d338d67aeb

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=7440e90

The following commit has been merged in the master branch:
commit 7440e904a3dc539c21fce7638ca951f4b9a0c372
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Nov 27 12:01:24 2015 +0100

    omit source builder test when uscan wasn't found
---
 test/test_ci_orig_source_builder.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/test_ci_orig_source_builder.rb b/test/test_ci_orig_source_builder.rb
index 7f20cff..1d848f5 100644
--- a/test/test_ci_orig_source_builder.rb
+++ b/test/test_ci_orig_source_builder.rb
@@ -8,6 +8,9 @@ module CI
       LSB.reset
       LSB.instance_variable_set(:@hash, DISTRIB_CODENAME: 'vivid')
       FileUtils.cp_r(Dir.glob("#{data}/*"), Dir.pwd)
+
+      return if system('type uscan > /dev/null 2>&1')
+      omit("#{self.class} requires uscan but uscan is not in $PATH")
     end
 
     def teardown

-- 
ci-tooling packaging