Modified: trunk/Tools/ChangeLog (101148 => 101149)
--- trunk/Tools/ChangeLog 2011-11-25 06:35:52 UTC (rev 101148)
+++ trunk/Tools/ChangeLog 2011-11-25 06:36:26 UTC (rev 101149)
@@ -1,3 +1,26 @@
+2011-11-24 Kentaro Hara <[email protected]>
+
+ Fix the current working directory of run-bindings-tests
+ https://bugs.webkit.org/show_bug.cgi?id=73106
+
+ Reviewed by Adam Barth.
+
+ Currently, run-bindings-tests outputs the following error
+ (although it outputs "all tests passed!" in the end):
+
+ Testing the ObjC generator on TestObj.idl
+ gcc: WebCore/bindings/objc/PublicDOMInterfaces.h: No such file or directory
+ gcc: warning: '-x objective-c' after last input file has no effect
+ gcc: no input files
+
+ This is because CodeGeneratorObjC.pm assumes that the current working directory
+ is WebKit/Source/, but run-bindings-tests sets the current working directory to WebKit/.
+ Thus, this patch changes it to WebKit/Source/.
+
+ * Scripts/run-bindings-tests:
+ (generate_from_idl):
+ (main):
+
2011-11-24 Tor Arne Vestbø <[email protected]>
[Qt] Get rid of the buildDirForSource() function in the build system
Modified: trunk/Tools/Scripts/run-bindings-tests (101148 => 101149)
--- trunk/Tools/Scripts/run-bindings-tests 2011-11-25 06:35:52 UTC (rev 101148)
+++ trunk/Tools/Scripts/run-bindings-tests 2011-11-25 06:36:26 UTC (rev 101149)
@@ -40,8 +40,8 @@
def generate_from_idl(generator, idl_file, output_directory):
cmd = ['perl', '-w',
- '-ISource/WebCore/bindings/scripts',
- 'Source/WebCore/bindings/scripts/generate-bindings.pl',
+ '-IWebCore/bindings/scripts',
+ 'WebCore/bindings/scripts/generate-bindings.pl',
# idl include directories (path relative to generate-bindings.pl)
'--include', '.',
'--defines', 'TESTING_%s' % generator,
@@ -109,7 +109,7 @@
reset_results = "--reset-results" in argv
current_scm = detect_scm_system(os.curdir)
- os.chdir(current_scm.checkout_root)
+ os.chdir(os.path.join(current_scm.checkout_root, 'Source'))
all_tests_passed = True
@@ -122,8 +122,8 @@
]
for generator in generators:
- input_directory = os.path.join('Source', 'WebCore', 'bindings', 'scripts', 'test')
- reference_directory = os.path.join('Source', 'WebCore', 'bindings', 'scripts', 'test', generator)
+ input_directory = os.path.join('WebCore', 'bindings', 'scripts', 'test')
+ reference_directory = os.path.join('WebCore', 'bindings', 'scripts', 'test', generator)
if not run_tests(generator, input_directory, reference_directory, reset_results):
all_tests_passed = False
