Convert more tests to the test driver

test/auto_contiguous_test.cpp

@@ -14,6 +14,7 @@ struct contiguous_target
     migraph::context get_context() const { return {}; }
 };
 
+// TODO: Add this test case
 void literal_broadcast()
 {
     migraph::program p;
@@ -25,7 +26,7 @@ void literal_broadcast()
     EXPECT(not p.get_shape().broadcasted());
 }
 
-void literal_transpose()
+TEST_CASE(literal_transpose)
 {
     migraph::program p;
     p.add_literal(get_2x2_transposed());
@@ -36,7 +37,7 @@ void literal_transpose()
     EXPECT(not p.get_shape().transposed());
 }
 
-void after_literal_transpose()
+TEST_CASE(after_literal_transpose)
 {
     migraph::program p;
     auto l = p.add_literal(get_2x2());
@@ -51,7 +52,7 @@ void after_literal_transpose()
     EXPECT(not p.get_shape().transposed());
 }
 
-void after_literal_broadcast()
+TEST_CASE(after_literal_broadcast)
 {
     migraph::program p;
     auto l1 = p.add_literal(get_2x2());
@@ -67,7 +68,7 @@ void after_literal_broadcast()
     EXPECT(not p.get_shape().broadcasted());
 }
 
-void after_param_transpose()
+TEST_CASE(after_param_transpose)
 {
     migraph::program p;
     auto l = p.add_parameter("2x2", {migraph::shape::float_type, {2, 2}});
@@ -82,7 +83,7 @@ void after_param_transpose()
     EXPECT(not p.get_shape().transposed());
 }
 
-void after_param_broadcast()
+TEST_CASE(after_param_broadcast)
 {
     migraph::program p;
     auto l1 = p.add_parameter("2x2", {migraph::shape::float_type, {2, 2}});
@@ -98,12 +99,4 @@ void after_param_broadcast()
     EXPECT(not p.get_shape().broadcasted());
 }
 
-int main()
-{
-    // literal_broadcast();
-    literal_transpose();
-    after_literal_transpose();
-    after_literal_broadcast();
-    after_param_transpose();
-    after_param_broadcast();
-}
+int main(int argc, const char* argv[]) { test::run(argc, argv); }

test/common_subexpression_elimination_test.cpp

@@ -14,7 +14,7 @@ struct cse_target
     migraph::context get_context() const { return {}; }
 };
 
-void cse_test1()
+TEST_CASE(cse_test1)
 {
     migraph::program p1;
     {
@@ -38,7 +38,7 @@ void cse_test1()
     EXPECT(p1 == p2);
 }
 
-void cse_test2()
+TEST_CASE(cse_test2)
 {
     migraph::program p1;
     {
@@ -63,7 +63,7 @@ void cse_test2()
     EXPECT(p1 == p2);
 }
 
-void cse_test3()
+TEST_CASE(cse_test3)
 {
     migraph::program p1;
     {
@@ -86,7 +86,7 @@ void cse_test3()
     EXPECT(p1 == p2);
 }
 
-void cse_test4()
+TEST_CASE(cse_test4)
 {
     migraph::program p1;
     {
@@ -112,10 +112,4 @@ void cse_test4()
     EXPECT(p1 == p2);
 }
 
-int main()
-{
-    cse_test1();
-    cse_test2();
-    cse_test3();
-    cse_test4();
-}
+int main(int argc, const char* argv[]) { test::run(argc, argv); }

test/constant_propagate_test.cpp

@@ -14,7 +14,7 @@ struct const_prop_target
     migraph::context get_context() const { return {}; }
 };
 
-void const_add1()
+TEST_CASE(const_add1)
 {
     migraph::program p1;
     auto one = p1.add_literal(1);
@@ -29,7 +29,7 @@ void const_add1()
     EXPECT(p1 == p2);
 }
 
-void const_add2()
+TEST_CASE(const_add2)
 {
     migraph::program p1;
     auto one = p1.add_parameter("one", {migraph::shape::int32_type, {1}});
@@ -44,7 +44,7 @@ void const_add2()
     EXPECT(p1 != p2);
 }
 
-void const_add3()
+TEST_CASE(const_add3)
 {
     migraph::program p1;
     auto one  = p1.add_literal(1);
@@ -60,9 +60,4 @@ void const_add3()
     EXPECT(p1 == p2);
 }
 
-int main()
-{
-    const_add1();
-    const_add2();
-    const_add3();
-}
+int main(int argc, const char* argv[]) { test::run(argc, argv); }

test/literal_test.cpp

@@ -51,10 +51,3 @@ TEST_CASE(literal_os3)
 }
 
 int main(int argc, const char* argv[]) { test::run(argc, argv); }
-
-// int main()
-// {
-//     literal_test();
-//     literal_os1();
-//     literal_os2();
-// }