updated some test related files as a preparation for a more intuitive automator
This commit is contained in:
parent
a182087537
commit
5321019457
4
Makefile
4
Makefile
|
@ -7,16 +7,14 @@ all: spectral marc processing
|
|||
|
||||
.PHONY: spectral
|
||||
spectral:
|
||||
@$(MAKE) clean -C code >/dev/null
|
||||
$(MAKE) -C code
|
||||
|
||||
.PHONY: marc
|
||||
marc:
|
||||
@./installation/mods_MarcMentat/apply_DAMASK_modifications.sh ${MAKEFLAGS}
|
||||
|
||||
.PHONY : processing
|
||||
.PHONY: processing
|
||||
processing:
|
||||
@$(MAKE) tidy -C code >/dev/null
|
||||
@./installation/compile_CoreModule.py ${MAKEFLAGS}
|
||||
|
||||
.PHONY: tidy
|
||||
|
|
|
@ -21,7 +21,7 @@ class Test():
|
|||
+'----------------------------------------------------------------\n' \
|
||||
+'| '+test_description+'\n' \
|
||||
+'----------------------------------------------------------------')
|
||||
self.dirBase = os.path.dirname(os.path.realpath(inspect.getfile(self.__class__)))
|
||||
self.dirBase = os.path.dirname(os.path.realpath(sys.modules[self.__class__.__module__].__file__))
|
||||
self.parser = OptionParser(
|
||||
description = 'Using: $Id run_test.py 1285 2012-02-09 08:54:09Z MPIE\m.diehl $',
|
||||
usage='run_test.py [options]')
|
||||
|
@ -207,12 +207,14 @@ class Test():
|
|||
|
||||
def execute_inCurrentDir(self,cmd,outfile='execute_log.txt'):
|
||||
|
||||
initialPath=os.getcwd()
|
||||
os.chdir(self.dirCurrent())
|
||||
file=open(outfile,'a+')
|
||||
print(cmd)
|
||||
process = subprocess.Popen(shlex.split(cmd),stdout = file,stderr = subprocess.STDOUT)
|
||||
process.wait()
|
||||
file.close()
|
||||
os.chdir(initialPath)
|
||||
|
||||
def compare_Array(self,File1,File2):
|
||||
|
||||
|
|
Loading…
Reference in New Issue