Skip to content

Commit 08d304f

Browse files
committed
Fix PermGen issue when running functional tests.
1 parent 90b66f6 commit 08d304f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,22 @@ jdk:
77
- oraclejdk7
88
- openjdk7
99

10-
env:
11-
- ANT_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
1210
cache:
1311
directories:
1412
- $HOME/.m2
1513

1614
before_script:
1715
- export DISPLAY=:99.0
1816
- sh -e /etc/init.d/xvfb start
19-
- sleep 3 # give xvfb some time to start
17+
- sleep 10 # give xvfb some time to start
2018
- wget http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201.zip -O netbeans.zip
2119
- unzip -q netbeans.zip
22-
- mvn -q dependency:get -Dartifact=junit:junit:4.8.2 -DrepoUrl=http://repo1.maven.org/maven2/
20+
#- mvn -q dependency:get -Dartifact=junit:junit:4.8.2 -DrepoUrl=http://repo1.maven.org/maven2/
2321
# To reduce amout of log
2422
- cd maven-wrapper/ && mvn -q install && cd ..
2523

2624
script:
27-
- ant -Dcontinue.after.failing.tests=true -Dnbplatform.nb81.netbeans.dest.dir=$PWD/netbeans -Dnbplatform.nb81.harness.dir=$PWD/netbeans/harness -Dfork=on test
25+
- ant -Dnbplatform.nb81.netbeans.dest.dir=$PWD/netbeans -Dnbplatform.nb81.harness.dir=$PWD/netbeans/harness -Dfork=true test
2826

2927
notifications:
3028
slack:

nbproject/project.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ modules=\
1414
project.fi.helsinki.cs.tmc=tmc-plugin
1515
project.fi.helsinki.cs.tmc.application=tmc-application
1616
run.args=-J-client -J-Xss2m -J-Xms32m -J-XX:PermSize=256m -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.zip.disableMemoryMapping=true
17+
run.jvmargs= -J-XX:PermSize=1024m -J-XX:MaxPermSize=2048m -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled
18+

0 commit comments

Comments
 (0)