Reviewers: Michael Starzinger,

Message:
Could you take a quick look?

Description:
Fix NaCl build.

[email protected]
BUG=

Please review this at https://codereview.chromium.org/527273003/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+3, -5 lines):
  M src/base/bits-unittest.cc
  M src/base/platform/semaphore.cc


Index: src/base/bits-unittest.cc
diff --git a/src/base/bits-unittest.cc b/src/base/bits-unittest.cc
index e0e6a5f1ef416ed29054a127cbc645a88ade36a3..e06fd097ead23487ad9084eb91558e02171eb8e8 100644
--- a/src/base/bits-unittest.cc
+++ b/src/base/bits-unittest.cc
@@ -84,12 +84,10 @@ TEST(Bits, RoundUpToPowerOfTwo32) {
 }


-#if 0
-// TODO(bmeurer): Fix this on NaCL builds.
 TEST(BitsDeathTest, DISABLE_IN_RELEASE(RoundUpToPowerOfTwo32)) {
-  ASSERT_DEATH({ RoundUpToPowerOfTwo32(0x80000001u); }, "0x80000000");
+  ASSERT_DEATH_IF_SUPPORTED({ RoundUpToPowerOfTwo32(0x80000001u); },
+                            "0x80000000");
 }
-#endif


 TEST(Bits, RoundDownToPowerOfTwo32) {
Index: src/base/platform/semaphore.cc
diff --git a/src/base/platform/semaphore.cc b/src/base/platform/semaphore.cc
index 669240e6088cc8093ed3ab5c89b24645421d13bb..0679c00d95ea4f74693db2366716f6e29e43fbb9 100644
--- a/src/base/platform/semaphore.cc
+++ b/src/base/platform/semaphore.cc
@@ -114,7 +114,7 @@ bool Semaphore::WaitFor(const TimeDelta& rel_time) {
   do {
     int result = sem_trywait(&native_handle_);
     if (result == 0) return true;
-    DCHECK(errno == EAGAIN || error == EINTR);
+    DCHECK(errno == EAGAIN || errno == EINTR);
   } while (!timer.HasExpired(rel_time));
   return false;
 #else


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to