fixes to regression tests

This commit is contained in:
Sean-M 2013-02-26 10:04:29 -05:00
parent fb0d09e2bf
commit 21768acdad

View File

@ -521,6 +521,7 @@ def run_ant():
elif SYS is OS.WIN:
theproc = subprocess.Popen(case.ant, shell = True)
theproc.communicate()
antout.close()
# Returns the type of image file, based off extension
class IMGTYPE:
@ -1291,6 +1292,7 @@ def gitPull(TskOrAutopsy):
else:
ccwd = os.path.join("..", "..")
subprocess.call(call, stdout=gpout, cwd=ccwd)
gpout.close()
#Builds TSK as a win32 applicatiion
@ -1307,6 +1309,7 @@ def vsBuild():
VSpth = make_local_path(case.output_dir, "VSOutput.txt")
VSout = open(VSpth, 'a')
subprocess.call(vs, stdout=VSout)
VSout.close()
chk = os.path.join("..", "..", "..","sleuthkit", "win32", "Release", "libtsk_jni.dll")
try:
open(chk)
@ -1336,6 +1339,7 @@ def antBuild(which, Build):
antpth = make_local_path(case.output_dir, "ant" + which + "Output.txt")
antout = open(antpth, 'a')
succd = subprocess.call(ant, stdout=antout)
antout.close()
if which == "datamodel":
chk = os.path.join("..", "..", "..","sleuthkit", "bindings", "java", "dist", "TSK_DataModel.jar")
try: