Skip to content
2 changes: 1 addition & 1 deletion ci/ci_steps.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
ENVOY_BUILD_SHA=fc747b3c2fd49b1260484572071fe4194cd6824d
ENVOY_BUILD_SHA=1d2a2100708d1012cd61054ce04d4dc4e3b03ff2

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change has no effect outside of this PR until it is merged, correct?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that is correct. But it's failing due to changes in bazel per the other open PR. See the comments there.


# Script that lists all the steps take by the CI system when doing Envoy builds.
set -e
Expand Down
10 changes: 5 additions & 5 deletions test/exe/signals_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ namespace Envoy {
#define ASANITIZED /* Sanitized by GCC */
#endif

// Memory violation signal tests are disabled under address sanitizer. The
// sanitizer does its own special signal handling and prints messages that are
// not ours instead of what this test expects. The signals special handled by ASAN
// include SIGSEGV, SIGBUS, and SIGFPE.
// Death tests that expect a particular output are disabled under address sanitizer.
// The sanitizer does its own special signal handling and prints messages that are
// not ours instead of what this test expects. As of latest Clang this appears
// to include abort() as well.
#ifndef ASANITIZED
TEST(Signals, InvalidAddressDeathTest) {
SignalAction actions;
Expand Down Expand Up @@ -52,7 +52,6 @@ TEST(Signals, BadMathDeathTest) {
raise(SIGFPE);
}(), "backtrace.*Floating point");
}
#endif

#if defined(__x86_64__) || defined(__i386__)
// Unfortunately we don't have a reliable way to do this on other platforms
Expand Down Expand Up @@ -81,6 +80,7 @@ TEST(Signals, RestoredPreviousHandlerDeathTest) {
// Outer SignalAction should be active again:
EXPECT_DEATH([]() -> void { abort(); }(), "backtrace.*Aborted");
}
#endif

TEST(Signals, IllegalStackAccessDeathTest) {
SignalAction actions;
Expand Down