zzh
/
gatk-3.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Using the base directory for each test run when outputting MD5DB mismatches." 

This reverts commit f192f032a153755a84b1d682f6e652a7c6787fb9.
This commit is contained in:
Khalid Shakir 2014-07-11 01:11:25 +08:00
parent cc09ef9190
commit 18f6d56b4c
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/gatk-tools-public/src/test/java/org/broadinstitute/gatk/utils/BaseTest.java
View File

@ -87,9 +87,6 @@ public abstract class BaseTest {
/** our log, which we want to capture anything from org.broadinstitute.sting */
public static final Logger logger = CommandLineUtils.getStingLogger();
private static final String CURRENT_DIRECTORY = System.getProperty("user.dir");
public static final String baseDirectory = System.getProperty("basedir", CURRENT_DIRECTORY) + "/";
public static final String hg18Reference = "/seq/references/Homo_sapiens_assembly18/v0/Homo_sapiens_assembly18.fasta";
public static final String hg19Reference = "/seq/references/Homo_sapiens_assembly19/v1/Homo_sapiens_assembly19.fasta";
public static final String b36KGReference = "/humgen/1kg/reference/human_b36_both.fasta";

4
public/gatk-tools-public/src/test/java/org/broadinstitute/gatk/utils/MD5DB.java
View File

@ -49,7 +49,7 @@ public class MD5DB {
*/
private static final int MAX_RECORDS_TO_READ = 1000000;
private static final int MAX_RAW_DIFFS_TO_SUMMARIZE = -1;
public static final String LOCAL_MD5_DB_DIR = BaseTest.baseDirectory + "integrationtests";
public static final String LOCAL_MD5_DB_DIR = "integrationtests";
public static final String GLOBAL_MD5_DB_DIR = "/humgen/gsa-hpprojects/GATK/data/integrationtests";
// tracking and emitting a data file of origina and new md5s
@ -95,7 +95,7 @@ public class MD5DB {
File dir = new File(LOCAL_MD5_DB_DIR);
if ( ! dir.exists() ) {
System.out.printf("##### Creating MD5 db %s%n", LOCAL_MD5_DB_DIR);
if ( ! dir.mkdirs() ) {
if ( ! dir.mkdir() ) {
// Need to check AGAIN whether the dir exists, because we might be doing multi-process parallelism
// within the same working directory, and another GATK instance may have come along and created the
// directory between the calls to exists() and mkdir() above.