diff --git a/comp.py b/comp.py index 4294d66ba2f39fa27b11ae5303dbf8cae5cc80fa..e7bcfa0c9deb05a1ad719279cc2f8b6521492ad9 100755 --- a/comp.py +++ b/comp.py @@ -161,7 +161,7 @@ class CompJob(ParametricJob): def doClean(self): dirs = [ repo.name for repo in self.repos ] - dirs.append('oo_metaB') + dirs.append('metaB') for dir in dirs: if os.path.isdir(dir): print("removing old %s directory" % dir) @@ -205,11 +205,11 @@ class CompJob(ParametricJob): if not os.path.isdir('oo_meta'): self.error('oo_meta not here!') # create bin dir - if os.path.isdir('oo_metaB'): - print('removing old %s directory' % 'oo_metaB') - shutil.rmtree('oo_metaB') - os.mkdir('oo_metaB') - os.chdir('oo_metaB') + if os.path.isdir('metaB'): + print('removing old %s directory' % 'metaB') + shutil.rmtree('metaB') + os.mkdir('metaB') + os.chdir('metaB') # which python? out = subprocess.check_output([self.pars['PYTHONEXE'].val, '-c', @@ -253,7 +253,7 @@ class CompJob(ParametricJob): self.compileMETAFOR() def cleanBattery(self): - os.chdir('oo_metaB/bin') + os.chdir('metaB/bin') print("cleaning old results") os.system("%s battery.py clean >/dev/null 2>&1" % self.pars['PYTHONEXE'].val) os.chdir('../..') @@ -261,7 +261,7 @@ class CompJob(ParametricJob): def startBat(self): now = datetime.datetime.now() print("starting battery at %s (come back tomorrow)" % now.ctime()) - os.chdir('oo_metaB/bin') + os.chdir('metaB/bin') #cmd="nice -%s %s battery.py %s -j %s -k %s >battery.log 2>&1" % \ # (self.pars['NICE_VALUE'].val, self.pars['PYTHONEXE'].val, \ # self.pars['BATTERY_ARG'].val,\ @@ -281,7 +281,7 @@ class CompJob(ParametricJob): os.chdir('../..') def checkResults(self): # pars indep - os.chdir('oo_metaB/bin') + os.chdir('metaB/bin') print ("diff'ing results") # cmd="%s battery.py diffTSC" % self.pars['PYTHONEXE'].val # <= future battery.py (using TSC) cmd="%s battery.py diff" % self.pars['PYTHONEXE'].val