From 4f83e3e69fd24d1268fd4fb5cffd79113da34744 Mon Sep 17 00:00:00 2001 From: "sergio@webkit.org" Date: Wed, 4 Jul 2012 08:05:18 +0000 Subject: [PATCH] [GTK] WebKit2 testing bot unable to find the build directory https://bugs.webkit.org/show_bug.cgi?id=90523 Reviewed by Carlos Garcia Campos. The presence of GNUmakefile was used to determine whether a given directory was a valid build directory or not. That's not correct for testing bots as we export only the minimum required stuff to run the tests. * gtk/common.py: (get_build_path.is_valid_build_directory): added an extra check.: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121837 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 15 +++++++++++++++ Tools/gtk/common.py | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index a0bf6ae..422255e 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,18 @@ +2012-07-04 Sergio Villar Senin + + [GTK] WebKit2 testing bot unable to find the build directory + https://bugs.webkit.org/show_bug.cgi?id=90523 + + Reviewed by Carlos Garcia Campos. + + The presence of GNUmakefile was used to determine whether a given + directory was a valid build directory or not. That's not correct for + testing bots as we export only the minimum required stuff to run the + tests. + + * gtk/common.py: + (get_build_path.is_valid_build_directory): added an extra check.: + 2012-07-04 Joe Thomas Adding myself to committers list. diff --git a/Tools/gtk/common.py b/Tools/gtk/common.py index 220a8cf..7b057e7 100644 --- a/Tools/gtk/common.py +++ b/Tools/gtk/common.py @@ -40,7 +40,8 @@ def get_build_path(): return build_dir def is_valid_build_directory(path): - return os.path.exists(os.path.join(path, 'GNUmakefile')) + return os.path.exists(os.path.join(path, 'GNUmakefile')) or \ + os.path.exists(os.path.join(path, 'Programs', 'DumpRenderTree')) if len(sys.argv[1:]) > 1 and os.path.exists(sys.argv[-1]) and is_valid_build_directory(sys.argv[-1]): return sys.argv[-1] -- 2.7.4