| commit | 114487ceb4410302b39411695312b61d98378e16 | [log] [tgz] |
|---|---|---|
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | Fri May 16 19:48:57 2014 +0000 |
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | Fri May 16 19:48:57 2014 +0000 |
| tree | a485fdb14c9c31ca84d69ab1b20c60cb49d53d15 | |
| parent | 90a17674f16feeea606908264cb75c769c5b4884 [diff] |
Fix generation tests. R=epoger@google.com TBR=epoger NOTRY=true BUG=skia:2565 Author: scroggo@google.com Review URL: https://codereview.chromium.org/284313007 git-svn-id: http://skia.googlecode.com/svn/trunk@14771 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/platform_tools/android/tests/expectations/Android.mk b/platform_tools/android/tests/expectations/Android.mk index bba6824..ec0a3c0 100644 --- a/platform_tools/android/tests/expectations/Android.mk +++ b/platform_tools/android/tests/expectations/Android.mk
@@ -150,10 +150,13 @@ # # benchmark (timings) -#include $(BASE_PATH)/bench/Android.mk +include $(BASE_PATH)/bench/Android.mk # golden-master (fidelity / regression test) -#include $(BASE_PATH)/gm/Android.mk +include $(BASE_PATH)/gm/Android.mk # unit-tests include $(BASE_PATH)/tests/Android.mk + +# diamond-master (one test to rule them all) +include $(BASE_PATH)/dm/Android.mk
diff --git a/platform_tools/android/tests/makefile_writer_tests.py b/platform_tools/android/tests/makefile_writer_tests.py index 6b72657..374c2dd 100644 --- a/platform_tools/android/tests/makefile_writer_tests.py +++ b/platform_tools/android/tests/makefile_writer_tests.py
@@ -119,7 +119,8 @@ """ vars_dict = generate_dummy_vars_dict(None) tool_makefile_writer.write_tool_android_mk(target_dir=target_dir, - var_dict=vars_dict) + var_dict=vars_dict, + place_in_local_tmp=False) class MakefileWriterTest(unittest.TestCase):