shape ops work in progress
milestone: about 1.6M tests pass

git-svn-id: http://skia.googlecode.com/svn/trunk@5035 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/Intersection_Tests.cpp b/experimental/Intersection/Intersection_Tests.cpp
index 017f1d1..414b911 100644
--- a/experimental/Intersection/Intersection_Tests.cpp
+++ b/experimental/Intersection/Intersection_Tests.cpp
@@ -7,7 +7,11 @@
 
 void Intersection_Tests() {
     SimplifyNew_Test();
+    Simplify4x4QuadralateralsThreaded_Test();
+    Simplify4x4QuadraticsThreaded_Test();
     Simplify4x4RectsThreaded_Test();
+    SimplifyNondegenerate4x4TrianglesThreaded_Test();
+    SimplifyDegenerate4x4TrianglesThreaded_Test();
     SimplifyFindNext_Test();
     SimplifyFindTop_Test();
     SimplifyAngle_Test();
@@ -35,15 +39,6 @@
     SimplifyQuadralateralPaths_Test();
 
     ActiveEdge_Test();
-#if TEST_QUADS_FIRST
-    Simplify4x4QuadraticsThreaded_Test();
-#endif
-    SimplifyDegenerate4x4TrianglesThreaded_Test();
-    SimplifyNondegenerate4x4TrianglesThreaded_Test();
-    Simplify4x4QuadralateralsThreaded_Test();
-#if !TEST_QUADS_FIRST
-    Simplify4x4QuadraticsThreaded_Test();
-#endif
 
     QuadraticCoincidence_Test();
     QuadraticIntersection_Test();