f3026389ff
Reason for revert:
Seems to break the Chromium build: https://codereview.chromium.org/2619193005/
Message:
[1832/9671] CXX obj/v8/v8_base/version.o
FAILED: obj/v8/v8_base/version.o
/b/c/cipd/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/v8/v8_base/version.o.d -DV8_DEPRECATION_WARNINGS -DDCHECK_ALWAYS_ON=1 -DUSE_UDEV -DUI_COMPOSITOR_IMAGE_TRANSPORT -DUSE_AURA=1 -DUSE_PANGO=1 -DUSE_CAIRO=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -DUSE_X11=1 -DUSE_PROPRIETARY_CODECS -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -DENABLE_MEDIA_ROUTER=1 -DFIELDTRIAL_TESTING_ENABLED -DCR_CLANG_REVISION=289944-2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DV8_I18N_SUPPORT -DENABLE_HANDLE_ZAPPING -DV8_USE_EXTERNAL_STARTUP_DATA -DV8_TARGET_ARCH_X64 -DDEBUG -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE -I../.. -Igen -I../../v8 -I../../v8/include -I../../third_party/icu/source/common -I../../third_party/icu/source/i18n -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -funwind-tables -fPIC -pipe -B../../third_party/binutils/Linux_x64/Release/bin -fcolor-diagnostics -fdebug-prefix-map=/b/c/b/linux/src=. -m64 -march=x86-64 -pthread -g1 --sysroot=../../build/linux/debian_wheezy_amd64-sysroot -fvisibility=hidden -Xclang -load -Xclang ../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so -Xclang -add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang check-ipc -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare -Werror -Wall -Wno-unused-variable -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-covered-switch-default -Wno-deprecated-register -Wno-unneeded-internal-declaration -Wno-inconsistent-missing-override -Wno-shift-negative-value -Wno-undefined-var-template -Wno-nonportable-include-path -Wno-address-of-packed-member -Wsign-compare -Winconsistent-missing-override -Wshorten-64-to-32 -O3 -fno-ident -fdata-sections -ffunction-sections -fno-threadsafe-statics -fvisibility-inlines-hidden -std=gnu++11 -fno-rtti -fno-exceptions -Wno-deprecated -c ../../v8/src/version.cc -o obj/v8/v8_base/version.o
../../v8/src/version.cc:42:34: error: use of undeclared identifier 'V8_EMBEDDER_STRING'
const char* Version::embedder_ = V8_EMBEDDER_STRING;
^
1 error generated.
Original issue's description:
> [build] Introduce an embedder version string
>
> Sometimes, the embedder might want to merge a fix to an abandoned branch
> or to a supported branch but the fix is not relevant to Chromium.
> This adds a new version string that the embedder can set on compile time
> and that will be appended to the official V8 version.
> The separator must be provided in the string. For instance, to have a
> full version string like "5.5.372.37.custom.1", the embedder must set
> V8_EMBEDDER_STRING to ".custom.1".
>
> Related Node.js issue: https://github.com/nodejs/node/pull/9754
>
> BUG=v8:5740
> R=machenbach@chromium.org,hablich@chromium.com,ofrobots@google.com
>
> Review-Url: https://codereview.chromium.org/2619213002
> Cr-Commit-Position: refs/heads/master@{#42175}
> Committed: fc86d4329b
TBR=hablich@chromium.com,machenbach@chromium.org,ofrobots@google.com,mic.besace@gmail.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=v8:5740
Review-Url: https://codereview.chromium.org/2621033002
Cr-Commit-Position: refs/heads/master@{#42182}
106 lines
4.4 KiB
C++
106 lines
4.4 KiB
C++
// 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
|
|
// with the distribution.
|
|
// * Neither the name of Google Inc. nor the names of its
|
|
// contributors may be used to endorse or promote products derived
|
|
// from this software without specific prior written permission.
|
|
//
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
#include "src/v8.h"
|
|
|
|
#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,
|
|
bool candidate, const char* soname) {
|
|
Version::major_ = major;
|
|
Version::minor_ = minor;
|
|
Version::build_ = build;
|
|
Version::patch_ = patch;
|
|
Version::candidate_ = candidate;
|
|
Version::soname_ = soname;
|
|
}
|
|
|
|
} // namespace internal
|
|
} // namespace v8
|
|
|
|
|
|
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(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, 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");
|
|
#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
|
|
}
|