Revert of [build] Introduce an embedder version string

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 19 matching lines @@
 #include "src/version.h"
 #include "test/cctest/cctest.h"
 
 using namespace v8::internal;
 
 
 namespace v8 {
 namespace internal {
 
 void SetVersion(int major, int minor, int build, int patch,
-                const char* embedder, bool candidate, const char* soname) {
+                bool candidate, const char* soname) {
   Version::major_ = major;
   Version::minor_ = minor;
   Version::build_ = build;
   Version::patch_ = patch;
-  Version::embedder_ = embedder;
   Version::candidate_ = candidate;
   Version::soname_ = soname;
 }
 
 }  // namespace internal
 }  // namespace v8
 
-static void CheckVersion(int major, int minor, int build, int patch,
-                         const char* embedder, bool candidate,
+
+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, embedder, candidate, "");
+  SetVersion(major, minor, build, patch, candidate, "");
   Version::GetString(version_str);
   CHECK_EQ(0, strcmp(expected_version_string, version_str.start()));
   Version::GetSONAME(soname_str);
   CHECK_EQ(0, strcmp(expected_generic_soname, soname_str.start()));
 
   // Test version with specific SONAME.
   const char* soname = "libv8.so.1";
-  SetVersion(major, minor, build, patch, embedder, candidate, soname);
+  SetVersion(major, minor, build, patch, candidate, soname);
   Version::GetString(version_str);
   CHECK_EQ(0, strcmp(expected_version_string, version_str.start()));
   Version::GetSONAME(soname_str);
   CHECK_EQ(0, strcmp(soname, soname_str.start()));
 }
 
 
 TEST(VersionString) {
 #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");
-  CheckVersion(2, 5, 10, 7, ".emb.1", false, "2.5.10.7.emb.1 SIMULATOR",
-               "libv8-2.5.10.7.emb.1.so");
-  CheckVersion(2, 5, 10, 7, ".emb.1", true,
-               "2.5.10.7.emb.1 (candidate) SIMULATOR",
-               "libv8-2.5.10.7.emb.1-candidate.so");
+  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");
-  CheckVersion(2, 5, 10, 7, ".emb.1", false, "2.5.10.7.emb.1",
-               "libv8-2.5.10.7.emb.1.so");
-  CheckVersion(2, 5, 10, 7, ".emb.1", true, "2.5.10.7.emb.1 (candidate)",
-               "libv8-2.5.10.7.emb.1-candidate.so");
+  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
 }