| 1 |
From 4fb35cfbf4b10d5644fd636ddfe3e07b5a932d45 Mon Sep 17 00:00:00 2001
|
| 2 |
From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
|
| 3 |
Date: Sun, 24 Jun 2012 14:01:54 +0200
|
| 4 |
Subject: [PATCH] dont run check targets in build, to allow running them
|
| 5 |
separately later
|
| 6 |
|
| 7 |
Change-Id: Idb46ebcb427522c74632a1813afcbb841fb61243
|
| 8 |
---
|
| 9 |
Makefile.top | 10 ++++++++--
|
| 10 |
solenv/bin/build.pl | 2 +-
|
| 11 |
solenv/gbuild/Module.mk | 2 +-
|
| 12 |
3 files changed, 10 insertions(+), 4 deletions(-)
|
| 13 |
|
| 14 |
diff --git a/Makefile.top b/Makefile.top
|
| 15 |
index 7362bbc..ae849fb 100644
|
| 16 |
--- a/Makefile.top
|
| 17 |
+++ b/Makefile.top
|
| 18 |
@@ -251,7 +252,7 @@ xpdf\
|
| 19 |
xsltml\
|
| 20 |
zlib\
|
| 21 |
|
| 22 |
-export gb_TAILBUILDTARGET=all slowcheck
|
| 23 |
+export gb_TAILBUILDTARGET=all
|
| 24 |
|
| 25 |
define gbuild_module_rules
|
| 26 |
.PHONY: $(1) $(1).all $(1).clean $(1).deliver
|
| 27 |
@@ -526,7 +527,7 @@ findunusedcode:
|
| 28 |
| grep -v WPX \
|
| 29 |
> unusedcode.easy
|
| 30 |
|
| 31 |
-check: dev-install subsequentcheck
|
| 32 |
+check: unitcheck slowcheck dev-install subsequentcheck
|
| 33 |
|
| 34 |
subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
|
| 35 |
$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
|
| 36 |
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
|
| 37 |
index 74d0f32..daa4ae0 100755
|
| 38 |
--- a/solenv/bin/build.pl
|
| 39 |
+++ b/solenv/bin/build.pl
|
| 40 |
@@ -1901,7 +1901,7 @@ sub run_job {
|
| 41 |
return 1 if (! $path =~ /prj$/ );
|
| 42 |
mkpath("$workdir/Logs");
|
| 43 |
my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM};
|
| 44 |
- my $gbuild_target = 'all slowcheck';
|
| 45 |
+ my $gbuild_target = 'all';
|
| 46 |
if ($registered_name =~ /tail_build\/prj$/ )
|
| 47 |
{
|
| 48 |
$gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM};
|
| 49 |
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
|
| 50 |
index e5f87f0..9c2608c 100644
|
| 51 |
--- a/solenv/gbuild/Module.mk
|
| 52 |
+++ b/solenv/gbuild/Module.mk
|
| 53 |
@@ -129,7 +129,7 @@ gb_Module_DEVINSTALLHINT=
|
| 54 |
debugrun :| build
|
| 55 |
endif
|
| 56 |
|
| 57 |
-all : build unitcheck
|
| 58 |
+all : build
|
| 59 |
$(info $(gb_Module_BUILDHINT))
|
| 60 |
|
| 61 |
build :
|
| 62 |
--
|
| 63 |
1.7.9.5
|
| 64 |
|
Parent Directory
| 
Revision Log