Commit dafecf89 authored by Sander van der Zeeuw's avatar Sander van der Zeeuw
Browse files

Merge branch 'fix-memory_test_threads' into 'develop'

Fix memory test threads

Java did take a few Gb's for each threads, on a desktop you have not enough memory anymore. Fixed this to give those threads a memory limit.

See merge request !255
parents aec67d97 11579c5d
...@@ -70,7 +70,7 @@ abstract class GentrapTestAbstract(val expressionMeasure: String) extends TestNG ...@@ -70,7 +70,7 @@ abstract class GentrapTestAbstract(val expressionMeasure: String) extends TestNG
.toMap .toMap
) )
val validExpressionMeasures = Set( val validExpressionMeasures = Set(
"fragments_per_gene", "fragments_per_exon", "bases_per_gene", "bases_per_exon", "fragments_per_gene", "fragments_per_exon", "bases_per_gene", "bases_per_exon",
"cufflinks_strict", "cufflinks_guided", "cufflinks_blind") "cufflinks_strict", "cufflinks_guided", "cufflinks_blind")
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
*/ */
package nl.lumc.sasc.biopet.pipelines.mapping package nl.lumc.sasc.biopet.pipelines.mapping
import java.io.{File, FileOutputStream} import java.io.{ File, FileOutputStream }
import com.google.common.io.Files import com.google.common.io.Files
import nl.lumc.sasc.biopet.pipelines.flexiprep.Fastqc import nl.lumc.sasc.biopet.pipelines.flexiprep.Fastqc
...@@ -25,7 +25,7 @@ import org.apache.commons.io.FileUtils ...@@ -25,7 +25,7 @@ import org.apache.commons.io.FileUtils
import org.broadinstitute.gatk.queue.QSettings import org.broadinstitute.gatk.queue.QSettings
import org.scalatest.Matchers import org.scalatest.Matchers
import org.scalatest.testng.TestNGSuite import org.scalatest.testng.TestNGSuite
import org.testng.annotations.{AfterClass, DataProvider, Test} import org.testng.annotations.{ AfterClass, DataProvider, Test }
/** /**
* Test class for [[Mapping]] * Test class for [[Mapping]]
......
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
<version>2.18.1</version> <version>2.18.1</version>
<configuration> <configuration>
<forkCount>1C</forkCount> <forkCount>1C</forkCount>
<argLine>-Xmx300m</argLine>
<workingDirectory>${project.build.directory}</workingDirectory> <workingDirectory>${project.build.directory}</workingDirectory>
</configuration> </configuration>
</plugin> </plugin>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment