Skip to content

Commit

Permalink
trying to fix memory error on report generation by keeping old report…
Browse files Browse the repository at this point in the history
…s, refs #21

git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk@15414 afbd958f-9f77-42d5-a016-97a22340ccf4
  • Loading branch information
behrisch committed Jan 16, 2014
1 parent 86f0988 commit 20c823b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions sumo/tools/build/dailyBuildMSVC.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@
if "SUMO_HOME" not in env:
env["SUMO_HOME"] = os.path.join(os.path.dirname(__file__), '..', '..')
shutil.rmtree(env["TEXTTEST_TMP"], True)
shutil.rmtree(env["SUMO_REPORT"], True)
os.mkdir(env["SUMO_REPORT"])
if not os.path.exists(env["SUMO_REPORT"]):
os.makedirs(env["SUMO_REPORT"])
for name in ["dfrouter", "duarouter", "jtrrouter", "netconvert", "netgenerate", "od2trips", "sumo", "polyconvert", "sumo-gui", "activitygen"]:
binary = os.path.join(options.rootDir, options.binDir, name + programSuffix + ".exe")
if name == "sumo-gui":
Expand All @@ -193,7 +193,7 @@
subprocess.call("texttest.py -b "+env["FILEPREFIX"]+nameopt, stdout=log, stderr=subprocess.STDOUT, shell=True)
subprocess.call("texttest.py -a sumo.gui -b "+env["FILEPREFIX"]+nameopt, stdout=log, stderr=subprocess.STDOUT, shell=True)
subprocess.call("texttest.py -b "+env["FILEPREFIX"]+" -coll", stdout=log, stderr=subprocess.STDOUT, shell=True)
ago = datetime.datetime.now() - datetime.timedelta(100)
ago = datetime.datetime.now() - datetime.timedelta(50)
subprocess.call('texttest.py -s "batch.ArchiveRepository session='+env["FILEPREFIX"]+' before=%s"' % ago.strftime("%d%b%Y"),
stdout=log, stderr=subprocess.STDOUT, shell=True)
log.close()
Expand Down
2 changes: 1 addition & 1 deletion sumo/tools/build/dailyUpdateMakeGCC
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ if test -e $SUMO_BINDIR/sumo -a $SUMO_BINDIR/sumo -nt $PREFIX/sumo/configure; th
export PATH=$PREFIX/texttest/bin:$PATH
export TEXTTEST_TMP=$PREFIX/texttesttmp
# find $SUMO_BATCH_RESULT -mtime +20 -type f | xargs -r rm
rm -rf $SUMO_REPORT/* $TEXTTEST_TMP/*
rm -rf $TEXTTEST_TMP/*
if test $FILEPREFIX == meso; then
tests/runInternalTests.py "b $FILEPREFIX" &> $TESTLOG
else
Expand Down

0 comments on commit 20c823b

Please sign in to comment.