From de517a2cd5b3cb011c8782eb49afa5c85abfb938 Mon Sep 17 00:00:00 2001
From: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Date: Mon, 15 Sep 2014 18:43:35 -0400
Subject: [PATCH] Bug 444196 - [tests] dsf-gdb tests fail the build when 'make'
 is not installed

This will make the build not fail but complete with errors.
Also, only build the test apps if we are going to run the tests.

Change-Id: I1a16eb812df45279d973ead37038683b5b0a5dff
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/33406
Tested-by: Hudson CI
Reviewed-by: Alvaro Sanchez-Leon <alvsan09@gmail.com>
---
 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/TestAppBuilder.xml | 2 +-
 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/TestAppBuilder.xml b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/TestAppBuilder.xml
index c8d75313c06..96c9fe00697 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/TestAppBuilder.xml
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/TestAppBuilder.xml
@@ -7,7 +7,7 @@
 
     <!-- targets -->
     <target name="makeTestApps" description="Create the binaries for the test applications">    
-            <exec executable="make" dir="${src_dir}" />
+            <exec executable="make" dir="${src_dir}" failifexecutionfails="false"/>
      </target>
 
     <condition property="binDirExists">
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
index 0c77061eb1c..a203422a5dc 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
@@ -39,7 +39,7 @@
 					</execution>
 					<execution>
 						<id>prepare</id>
-						<phase>validate</phase>
+						<phase>pre-integration-test</phase>
 						<configuration>
 							<tasks>
 								<ant antfile="TestAppBuilder.xml" target="makeTestApps"/>