[Isolates] Merge crankshaft (r5922 from bleeding_edge).

test/cctest/test-version.cc

 // Copyright 2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 31 matching lines @@
   Version::minor_ = minor;
   Version::build_ = build;
   Version::patch_ = patch;
   Version::candidate_ = candidate;
   Version::soname_ = soname;
 }
 
 } }  // namespace v8::internal
 
 
-static void CheckBakedVersion() {
-  static v8::internal::EmbeddedVector<char, 128> dyn_version_str;
-  Version::GetString(dyn_version_str);
-  CHECK_EQ(Version::GetVersion(), dyn_version_str.start());
-}
-
-
 static void CheckVersion(int major, int minor, int build,
                          int patch, bool candidate,
                          const char* expected_version_string,
                          const char* expected_generic_soname) {
   static v8::internal::EmbeddedVector<char, 128> version_str;
   static v8::internal::EmbeddedVector<char, 128> soname_str;
 
   // Test version without specific SONAME.
   SetVersion(major, minor, build, patch, candidate, "");
   Version::GetString(version_str);
   CHECK_EQ(expected_version_string, version_str.start());
   Version::GetSONAME(soname_str);
   CHECK_EQ(expected_generic_soname, soname_str.start());
 
   // Test version with specific SONAME.
   const char* soname = "libv8.so.1";
   SetVersion(major, minor, build, patch, candidate, soname);
   Version::GetString(version_str);
   CHECK_EQ(expected_version_string, version_str.start());
   Version::GetSONAME(soname_str);
   CHECK_EQ(soname, soname_str.start());
 }
 
 
 TEST(VersionString) {
-  CheckBakedVersion();
+#ifdef USE_SIMULATOR
+  CheckVersion(0, 0, 0, 0, false, "0.0.0 SIMULATOR", "libv8-0.0.0.so");
+  CheckVersion(0, 0, 0, 0, true,
+               "0.0.0 (candidate) SIMULATOR", "libv8-0.0.0-candidate.so");
+  CheckVersion(1, 0, 0, 0, false, "1.0.0 SIMULATOR", "libv8-1.0.0.so");
+  CheckVersion(1, 0, 0, 0, true,
+               "1.0.0 (candidate) SIMULATOR", "libv8-1.0.0-candidate.so");
+  CheckVersion(1, 0, 0, 1, false, "1.0.0.1 SIMULATOR", "libv8-1.0.0.1.so");
+  CheckVersion(1, 0, 0, 1, true,
+               "1.0.0.1 (candidate) SIMULATOR", "libv8-1.0.0.1-candidate.so");
+  CheckVersion(2, 5, 10, 7, false, "2.5.10.7 SIMULATOR", "libv8-2.5.10.7.so");
+  CheckVersion(2, 5, 10, 7, true,
+               "2.5.10.7 (candidate) SIMULATOR", "libv8-2.5.10.7-candidate.so");
+#else
   CheckVersion(0, 0, 0, 0, false, "0.0.0", "libv8-0.0.0.so");
   CheckVersion(0, 0, 0, 0, true,
                "0.0.0 (candidate)", "libv8-0.0.0-candidate.so");
   CheckVersion(1, 0, 0, 0, false, "1.0.0", "libv8-1.0.0.so");
   CheckVersion(1, 0, 0, 0, true,
                "1.0.0 (candidate)", "libv8-1.0.0-candidate.so");
   CheckVersion(1, 0, 0, 1, false, "1.0.0.1", "libv8-1.0.0.1.so");
   CheckVersion(1, 0, 0, 1, true,
                "1.0.0.1 (candidate)", "libv8-1.0.0.1-candidate.so");
   CheckVersion(2, 5, 10, 7, false, "2.5.10.7", "libv8-2.5.10.7.so");
   CheckVersion(2, 5, 10, 7, true,
                "2.5.10.7 (candidate)", "libv8-2.5.10.7-candidate.so");
+#endif
 }