223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

updated some test related files as a preparation for a more intuitive automator

This commit is contained in:
Martin Diehl 2014-06-03 10:30:51 +00:00
parent a182087537
commit 5321019457
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -7,16 +7,14 @@ all: spectral marc processing
.PHONY: spectral .PHONY: spectral
spectral: spectral:
@$(MAKE) clean -C code >/dev/null
$(MAKE) -C code $(MAKE) -C code
.PHONY: marc .PHONY: marc
marc: marc:
@./installation/mods_MarcMentat/apply_DAMASK_modifications.sh ${MAKEFLAGS} @./installation/mods_MarcMentat/apply_DAMASK_modifications.sh ${MAKEFLAGS}
.PHONY : processing .PHONY: processing
processing: processing:
@$(MAKE) tidy -C code >/dev/null
@./installation/compile_CoreModule.py ${MAKEFLAGS} @./installation/compile_CoreModule.py ${MAKEFLAGS}
.PHONY: tidy .PHONY: tidy

4
lib/damask/test/test.py
View File

@ -21,7 +21,7 @@ class Test():
+'----------------------------------------------------------------\n' \ +'----------------------------------------------------------------\n' \
+'| '+test_description+'\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( self.parser = OptionParser(
description = 'Using: $Id run_test.py 1285 2012-02-09 08:54:09Z MPIE\m.diehl $', description = 'Using: $Id run_test.py 1285 2012-02-09 08:54:09Z MPIE\m.diehl $',
usage='run_test.py [options]') usage='run_test.py [options]')
@ -207,12 +207,14 @@ class Test():
def execute_inCurrentDir(self,cmd,outfile='execute_log.txt'): def execute_inCurrentDir(self,cmd,outfile='execute_log.txt'):
initialPath=os.getcwd()
os.chdir(self.dirCurrent()) os.chdir(self.dirCurrent())
file=open(outfile,'a+') file=open(outfile,'a+')
print(cmd) print(cmd)
process = subprocess.Popen(shlex.split(cmd),stdout = file,stderr = subprocess.STDOUT) process = subprocess.Popen(shlex.split(cmd),stdout = file,stderr = subprocess.STDOUT)
process.wait() process.wait()
file.close() file.close()
os.chdir(initialPath)
def compare_Array(self,File1,File2): def compare_Array(self,File1,File2):