Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Unified Diff: courgette/ensemble_unittest.cc

Issue 647093002: Re-enable ensemble tests on Windows Release builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: courgette/ensemble_unittest.cc
diff --git a/courgette/ensemble_unittest.cc b/courgette/ensemble_unittest.cc
index e2f119812537ac4c2b1f9bfe8118f8d9f6fab2d0..a83e7d2c0da66b76c5e499030e4d044bd1b4c37e 100644
--- a/courgette/ensemble_unittest.cc
+++ b/courgette/ensemble_unittest.cc
@@ -6,6 +6,18 @@
#include "courgette/courgette.h"
#include "courgette/streams.h"
+#if defined(OS_WIN) && !defined(NDEBUG)
+// Ensemble tests still take too long on Debug Windows so disabling for now
+// TODO(dgarrett) http://code.google.com/p/chromium/issues/detail?id=101614
+#define MAYBE_PE DISABLED_PE
+#define MAYBE_PE64 DISABLED_PE64
+#define MAYBE_Elf32 DISABLED_Elf32
+#else
+#define MAYBE_PE PE
+#define MAYBE_PE64 PE64
+#define MAYBE_Elf32 Elf32
+#endif
+
class EnsembleTest : public BaseTest {
public:
@@ -103,17 +115,14 @@ void EnsembleTest::Pe64Ensemble() const {
TestEnsemble(src_bytes, tgt_bytes);
}
-// Ensemble tests still take too long on Windows so disabling for now
-// TODO(dgarrett) http://code.google.com/p/chromium/issues/detail?id=101614
-
-TEST_F(EnsembleTest, DISABLED_PE) {
+TEST_F(EnsembleTest, MAYBE_PE) {
PeEnsemble();
}
-TEST_F(EnsembleTest, DISABLED_PE64) {
+TEST_F(EnsembleTest, MAYBE_PE64) {
Pe64Ensemble();
}
-TEST_F(EnsembleTest, DISABLED_Elf32) {
+TEST_F(EnsembleTest, MAYBE_Elf32) {
Elf32Ensemble();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698