From ac0963a0a5fe5b4e1114f0e7d1b011a65b0130ae Mon Sep 17 00:00:00 2001 From: Dmitry Babokin Date: Fri, 31 Jan 2014 20:11:02 +0400 Subject: [PATCH 1/2] workaround for not removed tmp folders on Windows --- run_tests.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/run_tests.py b/run_tests.py index e6429861..85190e22 100755 --- a/run_tests.py +++ b/run_tests.py @@ -295,6 +295,8 @@ def run_tasks_from_queue(queue, queue_ret, queue_skip, total_tests_arg, max_test if is_windows: tmpdir = "tmp%d" % os.getpid() + while os.access(tmpdir, os.F_OK): + tmpdir = "%sx" % tmpdir os.mkdir(tmpdir) os.chdir(tmpdir) else: From 90ba3fddbce14e79b5fb342752d76a52e2dd762d Mon Sep 17 00:00:00 2001 From: Dmitry Babokin Date: Fri, 31 Jan 2014 21:11:33 +0400 Subject: [PATCH 2/2] Fix for incorrect target list on Windows --- alloy.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/alloy.py b/alloy.py index 57d8df1e..b30b98ba 100755 --- a/alloy.py +++ b/alloy.py @@ -224,6 +224,7 @@ def build_LLVM(version_LLVM, revision, folder, tarball, debug, selfbuild, extra, def check_targets(): answer = [] + answer_generic = [] answer_sde = [] # check what native targets do we have if current_OS != "Windows": @@ -244,7 +245,7 @@ def check_targets(): targets[j][2] = True break if current_OS != "Windows": - answer = answer + ["generic-4", "generic-16", "generic-8", "generic-1", "generic-32", "generic-64"] + answer_generic = ["generic-4", "generic-16", "generic-8", "generic-1", "generic-32", "generic-64"] # now check what targets we have with the help of SDE sde_exists = "" PATH_dir = string.split(os.getenv("PATH"), os.pathsep) @@ -262,7 +263,7 @@ def check_targets(): error("you haven't got sde neither in SDE_HOME nor in your PATH.\n" + "To test all platforms please set SDE_HOME to path containing SDE.\n" + "Please refer to http://www.intel.com/software/sde for SDE download information.", 2) - return [answer, answer_sde] + return [answer, answer_generic, answer_sde] # here we have SDE f_lines = take_lines(sde_exists + " -help", "all") for i in range(0,len(f_lines)): @@ -274,7 +275,7 @@ def check_targets(): answer_sde = answer_sde + [["-ivb", "avx1.1-i32x8"], ["-ivb", "avx1.1-i32x16"], ["-ivb", "avx1.1-i64x4"]] if targets[0][2] == False and "hsw" in f_lines[i]: answer_sde = answer_sde + [["-hsw", "avx2-i32x8"], ["-hsw", "avx2-i32x16"], ["-hsw", "avx2-i64x4"]] - return [answer, answer_sde] + return [answer, answer_generic, answer_sde] def build_ispc(version_LLVM, make): current_path = os.getcwd() @@ -378,7 +379,7 @@ def validation_run(only, only_targets, reference_branch, number, notify, update, stability.no_opt = False stability.wrapexe = "" # prepare parameters of run - [targets_t, sde_targets_t] = check_targets() + [targets_t, targets_generic_t, sde_targets_t] = check_targets() rebuild = True opts = [] archs = [] @@ -416,6 +417,10 @@ def validation_run(only, only_targets, reference_branch, number, notify, update, if i in targets_t[j]: targets.append(targets_t[j]) err = False + for j in range(0,len(targets_generic_t)): + if i in targets_generic_t[j]: + targets.append(targets_generic_t[j]) + err = False for j in range(0,len(sde_targets_t)): if i in sde_targets_t[j][1]: sde_targets.append(sde_targets_t[j]) @@ -423,7 +428,7 @@ def validation_run(only, only_targets, reference_branch, number, notify, update, if err == True: error("You haven't sde for target " + i, 1) else: - targets = targets_t[:-4] + targets = targets_t + targets_generic_t[:-4] sde_targets = sde_targets_t if "build" in only: targets = []