Changeset 141441 in webkit


Ignore:
Timestamp:
Jan 31, 2013 10:50:06 AM (11 years ago)
Author:
zandobersek@gmail.com
Message:

REGRESSION (r141402): incorrectly set injected bundle path when running GTK unit tests
https://bugs.webkit.org/show_bug.cgi?id=108496

Reviewed by Philippe Normand.

  • Scripts/run-gtk-tests:

(TestRunner.init): Add the build type as a member on the TestRunner interface.
(TestRunner._setup_testing_environment): Use the build type member to determine correct path
to the injected bundle.

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r141439 r141441  
     12013-01-31  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        REGRESSION (r141402): incorrectly set injected bundle path when running GTK unit tests
     4        https://bugs.webkit.org/show_bug.cgi?id=108496
     5
     6        Reviewed by Philippe Normand.
     7
     8        * Scripts/run-gtk-tests:
     9        (TestRunner.__init__): Add the build type as a member on the TestRunner interface.
     10        (TestRunner._setup_testing_environment): Use the build type member to determine correct path
     11        to the injected bundle.
     12
    1132013-01-31  Christophe Dumez  <dchris@gmail.com>
    214
  • trunk/Tools/Scripts/run-gtk-tests

    r141402 r141441  
    8787    def __init__(self, options, tests=[]):
    8888        self._options = options
    89 
    90         if options.debug:
    91             build_type = 'Debug'
    92         else:
    93             build_type = 'Release'
    94 
    95         self._programs_path = common.build_path(build_type, "Programs")
     89        self._build_type = "Debug" if self._options.debug else "Release"
     90
     91        self._programs_path = common.build_path(self._build_type, "Programs")
    9692        self._tests = self._get_tests(tests)
    9793        self._skipped_tests = TestRunner.SKIPPED
     
    166162        self._test_env['GSETTINGS_BACKEND'] = 'memory'
    167163        self._test_env["TEST_WEBKIT_API_WEBKIT2_RESOURCES_PATH"] = common.top_level_path("Tools", "TestWebKitAPI", "Tests", "WebKit2")
    168         self._test_env["TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH"] = common.build_path("Libraries")
     164        self._test_env["TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH"] = common.build_path(self._build_type, "Libraries")
    169165        self._test_env["WEBKIT_EXEC_PATH"] = self._programs_path
    170166
Note: See TracChangeset for help on using the changeset viewer.