Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

src: remove GTEST_DONT_DEFINE_ASSERT_EQ in util.h #12638

Closed
wants to merge 1 commit into from

Conversation

@danbev
Copy link
Member

commented Apr 25, 2017

As indicated by the FIXME comment, this macro guard is no longer needed.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines
Affected core subsystem(s)

src

src: remove GTEST_DONT_DEFINE_ASSERT_EQ in util.h
As indicated by the FIXME comment, this macro guard is no longer needed.
@danbev

This comment has been minimized.

Copy link
Member Author

commented Apr 25, 2017

@addaleax

This comment has been minimized.

Copy link
Member

commented Apr 27, 2017

LGTM

Landed in 5bb06e8

@addaleax addaleax closed this Apr 27, 2017

addaleax added a commit that referenced this pull request Apr 27, 2017
src: remove GTEST_DONT_DEFINE_ASSERT_EQ in util.h
As indicated by the FIXME comment, this macro guard is no longer needed.

PR-URL: #12638
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
@evanlucas

This comment has been minimized.

Copy link
Member

commented May 1, 2017

This is landing on v7.x-staging, but causes a compilation error.

Undefined symbols for architecture x86_64:
  "node::Abort()", referenced from:
      node::inspector::InspectorSocketServer::HandshakeCallback(node::inspector::InspectorSocket*, node::inspector::inspector_handshake_event, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&) in inspector_socket_server.o
  "node::Assert(char const* const (*) [4])", referenced from:
      UtilTest_Malloc_Test::TestBody() in util.o
      UtilTest_Calloc_Test::TestBody() in util.o
      UtilTest_MaybeStackBuffer_Test::TestBody() in util.o
      node::MaybeStackBuffer<unsigned char, 1024ul>::SetLength(unsigned long) in util.o
      node::MaybeStackBuffer<unsigned char, 1024ul>::SetLengthAndZeroTerminate(unsigned long) in util.o
      node::MaybeStackBuffer<unsigned char, 1024ul>::AllocateSufficientStorage(unsigned long) in util.o
      node::MaybeStackBuffer<unsigned short, 1024ul>::SetLength(unsigned long) in util.o
      ...
ld: symbol(s) not found for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
make[1]: *** [/Volumes/code/forks/WORK-node/out/Release/cctest] Error 1
make[1]: *** Waiting for unfinished jobs....
rm fe2fa96b1035b05b2fe602777c9605ade7b05863.intermediate
make: *** [node] Error 2

Marking dont-land for now. Feel free to backport if it is needed. Thanks!

@addaleax

This comment has been minimized.

Copy link
Member

commented May 1, 2017

I think this just depends on the backport in #12664

@addaleax addaleax added lib / src and removed dont-land-on-v7.x labels May 1, 2017

@jasnell jasnell referenced this pull request May 11, 2017
@gibfahn gibfahn referenced this pull request Jun 15, 2017
2 of 3 tasks complete
@gibfahn

This comment has been minimized.

Copy link
Member

commented Jun 18, 2017

@danbev should this land on v6.x? It cherry-picks cleanly, but I'm not sure whether it needs to depend on the other commits in #12664, some of which are semver-minor or semver-major.

@danbev danbev deleted the danbev:remove-gtest-macro-guard branch Jun 28, 2017

@MylesBorins

This comment has been minimized.

Copy link
Member

commented Jul 17, 2017

ping @danbev

danbev added a commit to danbev/node that referenced this pull request Aug 15, 2017
src: remove GTEST_DONT_DEFINE_ASSERT_EQ in util.h
As indicated by the FIXME comment, this macro guard is no longer needed.

PR-URL: nodejs#12638
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
MylesBorins added a commit that referenced this pull request Aug 16, 2017
src: remove GTEST_DONT_DEFINE_ASSERT_EQ in util.h
As indicated by the FIXME comment, this macro guard is no longer needed.

PR-URL: #12638
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
@MylesBorins MylesBorins referenced this pull request Aug 16, 2017
MylesBorins added a commit that referenced this pull request Sep 5, 2017
src: remove GTEST_DONT_DEFINE_ASSERT_EQ in util.h
As indicated by the FIXME comment, this macro guard is no longer needed.

PR-URL: #12638
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
9 participants
You can’t perform that action at this time.