Pass command line args to apptests

mojo/public/cpp/application/lib/application_test_main.cc

Index: mojo/public/cpp/application/lib/application_test_main.cc
diff --git a/mojo/public/cpp/application/lib/application_test_main.cc b/mojo/public/cpp/application/lib/application_test_main.cc
index 6cdfb0d7fa53eab272d69fdd3967e28ce3a0a038..65a65b25ac21d54bc60bafea053b2042369cfb05 100644
--- a/mojo/public/cpp/application/lib/application_test_main.cc
+++ b/mojo/public/cpp/application/lib/application_test_main.cc
@@ -21,14 +21,14 @@ MojoResult MojoMain(MojoHandle shell_handle) {
 
     // Construct an ApplicationImpl just for the GTEST commandline arguments.
     // GTEST command line arguments are supported amid application arguments:
-    // $ mojo_shell 'mojo:example_apptests arg1 --gtest_filter=foo arg2'
+    // $ mojo_shell mojo:example_apptests \

[jamesr, 2014/11/24 20:22:40]

this breaks the android build:

FAILED: /b/build/goma/gomacc
../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++
-MMD -MF
obj/mojo/public/cpp/application/lib/test_support_standalone.application_test_main.o.d
-DCHROMIUM_BUILD -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=1
-DENABLE_NOTIFICATIONS -DENABLE_BROWSER_CDMS -DENABLE_PRINTING=1
-DENABLE_BASIC_PRINTING=1 -DUSE_OPENSSL=1 -DUSE_OPENSSL_CERTS=1 -DNO_TCMALLOC
-DDISABLE_NACL -DENABLE_CONFIGURATION_POLICY -DENABLE_MANAGED_USERS=1
-DENABLE_AUTOFILL_DIALOG=1 -D_FILE_OFFSET_BITS=64 -DANDROID -DHAVE_SYS_UIO_H
-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DUSE_STLPORT=1
-D_STLP_USE_PTR_SPECIALIZATIONS=1 -D__GNU_SOURCE=1 -DNDEBUG
-DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DGTEST_HAS_RTTI=0
-DGTEST_USE_OWN_TR1_TUPLE=1 -DGTEST_HAS_TR1_TUPLE=1 -I../.. -Igen
-I../../testing/gtest/include -fno-strict-aliasing -march=armv7-a
-mfloat-abi=softfp -mtune=generic-armv7-a -mthumb -mthumb-interwork
-fno-tree-sra -fno-caller-saves -funwind-tables -fPIC -pipe -ffunction-sections
-funwind-tables -fno-short-enums -finline-limit=64 -mfpu=vfpv3-d16 -Wall
-Wsign-compare -Wendif-labels -Werror -Wno-missing-field-initializers
-Wno-unused-parameter -Wno-psabi -Wno-extra -Wno-ignored-qualifiers
-Wno-type-limits -Wno-unused-local-typedefs
-isystem../../third_party/android_tools/ndk/sources/cxx-stl/stlport/stlport
-fvisibility=hidden
--sysroot=/b/build/slave/mojo/build/src/third_party/android_tools/ndk/platforms/android-14/arch-arm
-fno-ident -fdata-sections -ffunction-sections -fomit-frame-pointer -Os -g2
-fno-threadsafe-statics -fvisibility-inlines-hidden -std=gnu++11 -Wno-narrowing
-Wno-literal-suffix -Wno-error=c++0x-compat -Wno-non-virtual-dtor
-Wno-sign-promo -fno-rtti -fno-exceptions -c
../../mojo/public/cpp/application/lib/application_test_main.cc -o
obj/mojo/public/cpp/application/lib/test_support_standalone.application_test_main.o
../../mojo/public/cpp/application/lib/application_test_main.cc:24:5: error:
multi-line comment [-Werror=comment]
     // $ mojo_shell mojo:example_apptests \
     ^
cc1plus: all warnings being treated as errors

(yes we should have trybots - will soon)

+    //   --args-for='mojo:example_apptests arg1 --gtest_filter=foo arg2'
     mojo::ApplicationDelegate dummy_application_delegate;
     mojo::ApplicationImpl app(&dummy_application_delegate, shell_handle);
     MOJO_CHECK(app.WaitForInitialize());
 
     // InitGoogleTest expects (argc + 1) elements, including a terminating NULL.
     // It also removes GTEST arguments from |argv| and updates the |argc| count.
-    // TODO(msw): Provide tests access to these actual command line arguments.
     const std::vector<std::string>& args = app.args();
     MOJO_CHECK(args.size() <
                static_cast<size_t>(std::numeric_limits<int>::max()));
@@ -40,6 +40,7 @@ MojoResult MojoMain(MojoHandle shell_handle) {
 
     testing::InitGoogleTest(&argc, const_cast<char**>(&(argv[0])));
     mojo::test::SetShellHandle(app.UnbindShell());
+    mojo::test::InitializeArgs(argc, argv);
   }
 
   int result = RUN_ALL_TESTS();