From 77e709f9e4799edaf932b7137a371a95e74fda32 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Fri, 30 Oct 2020 12:29:50 -0400
Subject: [PATCH] pathing jar for qa-functional

---
 Core/build.xml | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/Core/build.xml b/Core/build.xml
index c0696134ed..e54c4eda97 100644
--- a/Core/build.xml
+++ b/Core/build.xml
@@ -197,16 +197,7 @@
     </target>
 
     <!--sets up integration test system properties, calls underlying test-init and then sets up the pathing jar-->
-    <target name="test-init" depends="projectized-common.test-init,getTestDataFiles,integration-pathing-jar" />
-        
-    
-    <target name="test-qa-functional">
-        <!--We don't want integration testing to run from standard qa functional-->
-        <property name="testing-pathing-jar.should-create" value="true"/>
-        <property name="test.excludes" value="**/org/sleuthkit/autopsy/integrationtesting/TestRunner.class"/>
-        <antcall target="projectized-common.test-qa-functional" />
-    </target>   
-    
+    <target name="test-init" depends="projectized-common.test-init,getTestDataFiles,qa-functional-pathing-jar" />
 
     <!--    
         The paths specified in 'module.run.classpath' are incorporated into the manifest of a jar and then the path to the 
@@ -214,7 +205,7 @@
         classpath length issues on windows.  More information on this technique can be found here: 
         https://stackoverflow.com/a/201969.
     -->
-    <target name="integration-pathing-jar" depends="projectized-common.test-init" if="testing-pathing-jar.should-create">
+    <target name="qa-functional-pathing-jar" depends="projectized-common.test-init">
         <sequential>
             <!--set up pathing jar based on module.run.classpath as classpath-->
             <path id="test.qa-functional.pathing-jar.module-cp.classpath" path="${module.run.classpath}"/>