Merge pull request #525 from broadinstitute/ks_external_test_fix
Fixed build bug in ./ant-bridge.sh unittest -Dsingle=...
This commit is contained in:
commit
cb2d937a34
|
|
@ -185,12 +185,14 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<!-- See explicit executions below -->
|
<!-- See explicit executions below -->
|
||||||
<skip>true</skip>
|
<skip>true</skip>
|
||||||
|
<failIfNoTests>false</failIfNoTests>
|
||||||
|
<!-- Pass various system properties -->
|
||||||
<systemPropertyVariables>
|
<systemPropertyVariables>
|
||||||
<!-- TODO: Fix BaseTest to not error out if this property is missing. -->
|
<java.io.tmpdir>${java.io.tmpdir}</java.io.tmpdir>
|
||||||
<pipeline.run>false</pipeline.run>
|
|
||||||
</systemPropertyVariables>
|
</systemPropertyVariables>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
|
<!-- Disable maven default execution -->
|
||||||
<execution>
|
<execution>
|
||||||
<id>default-test</id>
|
<id>default-test</id>
|
||||||
<phase>none</phase>
|
<phase>none</phase>
|
||||||
|
|
@ -218,9 +220,10 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<!-- See explicit executions below -->
|
<!-- See explicit executions below -->
|
||||||
<skip>true</skip>
|
<skip>true</skip>
|
||||||
|
<failIfNoTests>false</failIfNoTests>
|
||||||
|
<!-- Pass various system properties -->
|
||||||
<systemPropertyVariables>
|
<systemPropertyVariables>
|
||||||
<!-- TODO: Fix BaseTest to not error out if this property is missing. -->
|
<java.io.tmpdir>${java.io.tmpdir}</java.io.tmpdir>
|
||||||
<pipeline.run>false</pipeline.run>
|
|
||||||
</systemPropertyVariables>
|
</systemPropertyVariables>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
|
|
|
||||||
|
|
@ -135,7 +135,7 @@ public abstract class BaseTest {
|
||||||
public final static String NA12878_PCRFREE = privateTestDir + "PCRFree.2x250.Illumina.20_10_11.bam";
|
public final static String NA12878_PCRFREE = privateTestDir + "PCRFree.2x250.Illumina.20_10_11.bam";
|
||||||
public final static String NA12878_WEx = privateTestDir + "CEUTrio.HiSeq.WEx.b37_decoy.NA12878.20_10_11mb.bam";
|
public final static String NA12878_WEx = privateTestDir + "CEUTrio.HiSeq.WEx.b37_decoy.NA12878.20_10_11mb.bam";
|
||||||
|
|
||||||
public static final boolean pipelineTestRunModeIsSet = System.getProperty("pipeline.run").equals("run");
|
public static final boolean pipelineTestRunModeIsSet = System.getProperty("pipeline.run", "").equals("run");
|
||||||
|
|
||||||
/** before the class starts up */
|
/** before the class starts up */
|
||||||
static {
|
static {
|
||||||
|
|
|
||||||
|
|
@ -359,8 +359,6 @@
|
||||||
<systemPropertyVariables>
|
<systemPropertyVariables>
|
||||||
<clover.pertest.coverage>diff</clover.pertest.coverage>
|
<clover.pertest.coverage>diff</clover.pertest.coverage>
|
||||||
<java.awt.headless>true</java.awt.headless>
|
<java.awt.headless>true</java.awt.headless>
|
||||||
<!-- TODO: Fix BaseTest to not error out if this property is missing. -->
|
|
||||||
<pipeline.run>${sting.pipelinetests.run}</pipeline.run>
|
|
||||||
<java.io.tmpdir>${java.io.tmpdir}</java.io.tmpdir>
|
<java.io.tmpdir>${java.io.tmpdir}</java.io.tmpdir>
|
||||||
</systemPropertyVariables>
|
</systemPropertyVariables>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue