diff options
| author | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-27 07:05:20 +0000 |
|---|---|---|
| committer | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-27 07:05:20 +0000 |
| commit | c1af406f4e0dad63677b21accd6ae4895f03955a (patch) | |
| tree | 056ee7d185dce180ff3eed9bcb85e5f31dd017cb | |
| parent | c055e7054c4654046e62d2b6b51fd371a3d09cc0 (diff) | |
| download | chromium_src-c1af406f4e0dad63677b21accd6ae4895f03955a.zip chromium_src-c1af406f4e0dad63677b21accd6ae4895f03955a.tar.gz chromium_src-c1af406f4e0dad63677b21accd6ae4895f03955a.tar.bz2 | |
Wrap NaCl based UI tests with if defined(DISABLE_NACL)
To prevent execution of NaCl based ui_tests, add ifdef around
macro which creates tests in ppapi_uitest.cc.
BUG= none
TEST= build
TBR= jasonwkim@google.com
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111649 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/ui/ppapi_uitest.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc index 68f42e2..b9bdfae 100644 --- a/chrome/test/ui/ppapi_uitest.cc +++ b/chrome/test/ui/ppapi_uitest.cc @@ -242,12 +242,17 @@ class PPAPINaClTest : public PPAPITestBase { } +#if defined(DISABLE_NACL) +#define TEST_PPAPI_NACL_VIA_HTTP(test_name) +#else // NaCl based PPAPI tests #define TEST_PPAPI_NACL_VIA_HTTP(test_name) \ TEST_F(PPAPINaClTest, test_name) { \ RunTestViaHTTP(#test_name); \ } +#endif + // // Interface tests. |