[SCM] ci-tooling packaging branch, master, updated. 085496ba9cf2a691b54557861c5c2f35601c748f

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 085496ba9cf2a691b54557861c5c2f35601c748f
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Mar 23 14:25:42 2015 +0100

    do not autodetect file if it was already manually set
---
 test/lib/testcase.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/lib/testcase.rb b/test/lib/testcase.rb
index a0a485e..269337e 100644
--- a/test/lib/testcase.rb
+++ b/test/lib/testcase.rb
@@ -25,7 +25,7 @@ class TestCase < Test::Unit::TestCase
 
   def self.inherited(subclass)
     super(subclass)
-    subclass.autodetect_inherited_file
+    subclass.autodetect_inherited_file unless @file
   end
 
   def priority_setup

-- 
ci-tooling packaging