Index: test/cctest/test-decls.cc |
diff --git a/test/cctest/test-decls.cc b/test/cctest/test-decls.cc |
index 35cb515dc100f7357e6047056b7870b7128054d8..9acbd04b1af13629f88b738625038f4660d20eaa 100644 |
--- a/test/cctest/test-decls.cc |
+++ b/test/cctest/test-decls.cc |
@@ -34,8 +34,11 @@ |
using namespace v8; |
- |
-enum Expectations { |
+// TODO(krasin): rename this type back to Expectations when |
+// https://crbug.com/630335 is fixed. Clang confuses two Expectations |
+// types: here and in test-field-type-tracking.cc, which makes the |
Benedikt Meurer
2016/08/10 08:09:33
How about just using an anonymous namespace?
krasin
2016/08/10 16:19:34
Done.
|
+// official Chrome build flaky. |
+enum ExpectationsCode { |
EXPECT_RESULT, |
EXPECT_EXCEPTION, |
EXPECT_ERROR |
@@ -61,7 +64,7 @@ class DeclarationContext { |
} |
void Check(const char* source, int get, int set, int has, |
- Expectations expectations, |
+ ExpectationsCode expectations, |
v8::Local<Value> value = Local<Value>()); |
int get_count() const { return get_count_; } |
@@ -138,7 +141,7 @@ void DeclarationContext::InitializeIfNeeded() { |
void DeclarationContext::Check(const char* source, int get, int set, int query, |
- Expectations expectations, |
+ ExpectationsCode expectations, |
v8::Local<Value> value) { |
InitializeIfNeeded(); |
// A retry after a GC may pollute the counts, so perform gc now |
@@ -505,7 +508,7 @@ class SimpleContext { |
context_->Exit(); |
} |
- void Check(const char* source, Expectations expectations, |
+ void Check(const char* source, ExpectationsCode expectations, |
v8::Local<Value> value = Local<Value>()) { |
HandleScope scope(context_->GetIsolate()); |
TryCatch catcher(context_->GetIsolate()); |