Merge branch 'test-driver'

test/simplify_reshapes_test.cpp

@@ -14,7 +14,7 @@ struct simplify_reshapes_target
     migraph::context get_context() const { return {}; }
 };
 
-void double_contig()
+TEST_CASE(double_contig)
 {
     migraph::program p;
     auto l  = p.add_literal(get_2x2());
@@ -32,7 +32,7 @@ void double_contig()
     EXPECT(result == get_2x2());
 }
 
-void double_transpose()
+TEST_CASE(double_transpose)
 {
     migraph::program p;
     auto l  = p.add_literal(get_2x2());
@@ -49,7 +49,7 @@ void double_transpose()
     EXPECT(result == get_2x2());
 }
 
-void double_transpose_contig()
+TEST_CASE(double_transpose_contig)
 {
     migraph::program p;
     auto l  = p.add_literal(get_2x2());
@@ -68,7 +68,7 @@ void double_transpose_contig()
     EXPECT(result == get_2x2());
 }
 
-void single_transpose()
+TEST_CASE(single_transpose)
 {
     migraph::program p;
     auto l  = p.add_literal(get_2x2());
@@ -84,7 +84,7 @@ void single_transpose()
     EXPECT(result != get_2x2());
 }
 
-void double_transpose_sin_pass()
+TEST_CASE(double_transpose_sin_pass)
 {
     migraph::program p;
     auto l  = p.add_literal(get_2x2());
@@ -102,7 +102,7 @@ void double_transpose_sin_pass()
     EXPECT(result == get_2x2());
 }
 
-void single_transpose_sin_pass()
+TEST_CASE(single_transpose_sin_pass)
 {
     migraph::program p;
     auto l = p.add_literal(get_2x2());
@@ -117,12 +117,4 @@ void single_transpose_sin_pass()
     EXPECT(result != get_2x2());
 }
 
-int main()
-{
-    double_contig();
-    double_transpose();
-    double_transpose_contig();
-    single_transpose();
-    double_transpose_sin_pass();
-    single_transpose_sin_pass();
-}
+int main(int argc, const char* argv[]) { test::run(argc, argv); }

test/validate.cpp

@@ -4,7 +4,7 @@
 #include <test.hpp>
 #include <rob.hpp>
 
-void simple_test()
+TEST_CASE(simple_test)
 {
     migraph::program p;
 
@@ -17,7 +17,7 @@ void simple_test()
     EXPECT(result != migraph::literal{4});
 }
 
-void out_of_order()
+TEST_CASE(out_of_order)
 {
     migraph::program p;
 
@@ -28,7 +28,7 @@ void out_of_order()
     EXPECT(bool{p.validate() == ins});
 }
 
-void incomplete_args()
+TEST_CASE(incomplete_args)
 {
     migraph::program p;
 
@@ -44,7 +44,7 @@ MIGRAPH_ROB(access_ins_arguments,
             migraph::instruction,
             arguments)
 
-void invalid_args()
+TEST_CASE(invalid_args)
 {
     migraph::program p;
 
@@ -55,10 +55,4 @@ void invalid_args()
     EXPECT(bool{p.validate() == p.begin()});
 }
 
-int main()
-{
-    simple_test();
-    out_of_order();
-    incomplete_args();
-    invalid_args();
-}
+int main(int argc, const char* argv[]) { test::run(argc, argv); }