move clang disable of Thens.cpp to thens.rb

Summary: So when we re-generate code we don't cause clang test failures (until #4412111 is done)

Test Plan: git diff

Reviewed By: jsedgwick@fb.com

Subscribers: net-systems@, fugalh, mathieubaudet, exa, njormrod, folly-diffs@

FB internal diff: D1644550

Tasks: 4412111

Signature: t1:1644550:1414604128:8184e7ce1f3e417c170ef67346d553caecc1f013

diff --git a/folly/wangle/test/Thens.cpp b/folly/wangle/test/Thens.cpp
index 268d36b20700c6059e9cafd1dc50343a7098d22d..a0e1be3250f7bccfdf983036c3f09eeeb65f84ab 100644 (file)
--- a/folly/wangle/test/Thens.cpp
+++ b/folly/wangle/test/Thens.cpp
@@ -1,9 +1,9 @@
 // This file is @generated by thens.rb
 
-#include <folly/wangle/test/Thens.h>
-
-#ifndef __clang__
 // TODO: fails to compile with clang:dev.  See task #4412111
+#ifndef __clang__
+
+#include <folly/wangle/test/Thens.h>
 
 TEST(Future, thenVariants) {
   SomeClass anObject;

diff --git a/folly/wangle/test/thens.rb b/folly/wangle/test/thens.rb
index 942096c3020558d8209388db0d55fb2b5152d1ee..e45b2c31dc2e63b90a3ef1f979bd804a9a7e3cfd 100755 (executable)
--- a/folly/wangle/test/thens.rb
+++ b/folly/wangle/test/thens.rb
@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+# ruby thens.rb > Thens.cpp
+
 # An exercise in combinatorics.
 # (ordinary/static function, member function, std::function, lambda)
 # X
@@ -59,7 +61,10 @@ tests = (
 ).map {|a| test(a)}.flatten
 
 print <<EOF
-// This file is #{"@"}generated by thens.rb
+// This file is #{"@"}generated by thens.rb. Do not edit directly.
+
+// TODO: fails to compile with clang:dev.  See task #4412111
+#ifndef __clang__
 
 #include <folly/wangle/test/Thens.h>
 
@@ -69,4 +74,6 @@ TEST(Future, thenVariants) {
 
   #{tests.join("\n  ")}
 }
+
+#endif
 EOF