Change run_vm_tests to take the VM arguments before the test name so

runtime/bin/run_vm_tests.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include <stdio.h>
 
 #include "bin/file.h"
 
 #include "vm/benchmark_test.h"
 #include "vm/dart.h"
@@ skipping 67 matching lines @@
     delete pprof_file;  // Closes the file.
     Dart_ExitScope();
     Dart_ShutdownIsolate();
   }
 }
 
 
 static void PrintUsage() {
   fprintf(stderr, "run_vm_tests [--list | --benchmarks | "
                   "--tests | --all | <test name> | <benchmark name>]\n");
   fprintf(stderr, "run_vm_tests  <test name> [vm-flags ...]\n");

[ricow1, 2012/10/01 13:50:28]

we should update these to reflect the new structure

[Mads Ager (google), 2012/10/01 14:03:38]

Done.

   fprintf(stderr, "run_vm_tests  <benchmark name> [flags ...]\n");
 }
 
 
 static int Main(int argc, const char** argv) {
   // Flags being passed to the Dart VM.
   int dart_argc = 0;
   const char** dart_argv = NULL;
   const char* pprof_filename = NULL;
 
   if (argc < 2) {
     // Bad parameter count.
     PrintUsage();
     return 1;
   } else if (argc == 2) {

[ricow1, 2012/10/01 13:50:28]

I think we may need to update the functionality in here as well. Additionally,
if we have exactly one vm flag and the testname we will hit the else clause in
the button of this clause and _not_ get the flag passed on the the vm (i.e., we
ignore it)

[Mads Ager (google), 2012/10/01 14:03:38]

This is the argc == 2 case where argv[0] is the executable and there is only one
more argument argv[1] which is either one of these flags or a run_filter. So no
update is needed here.

     if (strcmp(argv[1], "--list") == 0) {
       run_filter = kList;
       // List all tests and benchmarks and exit without initializing the VM.
       TestCaseBase::RunAll();
       Benchmark::RunAll(argv[0]);
       return 0;
     } else if (strcmp(argv[1], "--all") == 0) {
       run_filter = kAll;
     } else if (strcmp(argv[1], "--tests") == 0) {
       run_filter = kAllTests;
     } else if (strcmp(argv[1], "--benchmarks") == 0) {
       run_filter = kAllBenchmarks;
     } else {
       run_filter = argv[1];
     }
   } else {
-    // First argument is the test name, the rest are vm flags.
-    run_filter = argv[1];
+    // Last argument is the test name, the rest are vm flags.
+    run_filter = argv[argc - 1];
     const char* pprof_option = "--generate_pprof_symbols=";
     int length = strlen(pprof_option);
-    if (strncmp(pprof_option, argv[2], length) == 0) {
-      pprof_filename = (argv[2] + length);
+    if (strncmp(pprof_option, argv[1], length) == 0) {
+      pprof_filename = (argv[1] + length);
       Dart_InitPprofSupport();
-      // Remove the first three values from the arguments.
+      // Remove the first two values (executable, pprof flag) from the
+      // arguments and exclude the last argument which is the test name.
       dart_argc = argc - 3;
-      dart_argv = &argv[3];
+      dart_argv = &argv[2];
     } else {
-      // Remove the first two values from the arguments.
+      // Remove the first value (executable) from the arguments and
+      // exclude the last argument which is the test name.
       dart_argc = argc - 2;
-      dart_argv = &argv[2];
+      dart_argv = &argv[1];
     }
   }
   bool set_vm_flags_success = Flags::ProcessCommandLineFlags(dart_argc,
                                                              dart_argv);
   ASSERT(set_vm_flags_success);
   bool init_success = Dart::InitOnce(NULL, NULL, NULL);
   ASSERT(init_success);
   // Apply the filter to all registered tests.
   TestCaseBase::RunAll();
   // Apply the filter to all registered benchmarks.
   Benchmark::RunAll(argv[0]);
   // Print a warning message if no tests or benchmarks were matched.
   if (run_matches == 0) {
     fprintf(stderr, "No tests matched: %s\n", run_filter);
     return 1;
   }
   // Dump symbol information for the profiler.
   DumpPprofSymbolInfo(pprof_filename);
   return 0;
 }
 
 }  // namespace dart
 
 
 int main(int argc, const char** argv) {
   return dart::Main(argc, argv);
 }