From: Modestas Vainius <modestas@vainius.eu>
Date: Tue, 17 Nov 2009 01:40:26 +0000 (-0500)
Subject: Enable verbose ctest output on test failure
X-Git-Tag: 7.4.4~9
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=97bda8bb14f0f314a5fa0b568e65443de3ab4f89;p=debhelper.git

Enable verbose ctest output on test failure

When test fails, enable verbose ctest output. This allows to
get more details on a test failure from the build logs.

Auto-select cmake in further steps only if cmake was run in configure step.
CMake writes CMakeCache.txt to build directory when it is run. Depend on the
presence of this file for auto-selection in build, test, install and clean
steps.

Signed-off-by: Modestas Vainius <modestas@vainius.eu>
---

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index 645c8c0..03e6ade 100644
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -17,7 +17,10 @@ sub check_auto_buildable {
 	my $this=shift;
 	my ($step)=@_;
 	my $ret = -e $this->get_sourcepath("CMakeLists.txt");
-	$ret &&= $this->SUPER::check_auto_buildable(@_) if $step ne "configure";
+	if ($step ne "configure") {
+		$ret &&= -e $this->get_buildpath("CMakeCache.txt") &&
+		         $this->SUPER::check_auto_buildable(@_);
+	}
 	return $ret;
 }