Use the correct directory for reading test data in libaddressinput.

This enables running libaddressinput unit tests on DrMemory bots, which work from the directory above src/. TBR=estade@chromium.org BUG=395169,396203 Review URL: https://codereview.chromium.org/401883006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285093 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Jul 24, 2014 · 91f894f · 91f894f
1 parent 9a5e66b
commit 91f894f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/third_party/libaddressinput/libaddressinput.gyp b/third_party/libaddressinput/libaddressinput.gyp
@@ -4,6 +4,7 @@
 {
   'includes': ['src/cpp/libaddressinput.gypi'],
   'variables': {
+    'libaddressinput_test_data_dir%': 'src/third_party/libaddressinput/src/testdata',
     'libaddressinput_util_files': [
       'src/cpp/src/address_data.cc',
       'src/cpp/src/address_field.cc',
@@ -144,7 +145,7 @@
         'chromium/trie_unittest.cc',
       ],
       'defines': [
-        'TEST_DATA_DIR="third_party/libaddressinput/src/testdata"',
+        'TEST_DATA_DIR="<(libaddressinput_test_data_dir)"',
       ],
       'include_dirs': [
         '../../',

diff --git a/tools/valgrind/gtest_exclude/libaddressinput_unittests.gtest-drmemory_win32.txt b/tools/valgrind/gtest_exclude/libaddressinput_unittests.gtest-drmemory_win32.txt