ftest now under cmake

- ftests return 0 on success;
- throw_if -> exit_if

pub/ftest/oi_p.f2t

@@ -3,5 +3,5 @@ fm 3 3 h
 cc p0*t
 op0 j+.77
 oi p0
-throw_unless(y[,,2]==2.77,"final_result_wrong")
-exit(1)
+exit_unless(y[,,2]==2.77,"final_result_wrong")
+exit(0)
\ No newline at end of file

pub/ftest/oy1.f2t

@@ -4,5 +4,5 @@ ox! i
 oy! j+i
 oz0! j
 oy x+z0
-throw_unless(y[0,2,7]==9&&y[1,2,7]==9,"final_result_wrong")
-exit(1)
+exit_unless(y[0,2,7]==9&&y[1,2,7]==9,"final_result_wrong")
+exit(0)
\ No newline at end of file

pub/ftest/oy_arg_collat.f2t

@@ -5,5 +5,5 @@ fm 7 1 h
 oy! i
 0 oy y/y[1,0]
 df
-throw_unless(y[2,2,6]==3,"final_result_wrong")
-exit(1)
+exit_unless(y[2,2,6]==3,"final_result_wrong")
+exit(0)
\ No newline at end of file

pub/ftest/oz.f2t

@@ -2,4 +2,5 @@
 fm 7 3 h
 oz+ 100*j
 mz- 0
-exit(z0[,2]==200)
+exit_unless(z0[,2]==200,"failed")
\ No newline at end of file
+exit(0)
\ No newline at end of file

pub/ftest/r_of_i.f2t

@@ -2,5 +2,5 @@
 fm 1 1 h
 or+ 77
 oy r0[1+i]
-throw_unless(y==77,"result_wrong")
-exit(1)
+exit_unless(y==77,"result_wrong")
+exit(0)
\ No newline at end of file

pub/ftest/run

@@ -4,11 +4,11 @@ COUNTER=0
 rm -f log.tmp
 for I in *.f2t; do
     ./$I >> log.tmp
-    if [ $? = 1 ]; then
+    if [ $? = 0 ]; then
        echo "passed $I"
     else
        echo "FAILED $I"
        let COUNTER=COUNTER+1
-    fi    
+    fi
 done
 echo "=> $COUNTER failures. See log.tmp for full dialogs."

pub/ftest/spheres_raw.f2t

 #!/usr/bin/env frida
 ry8 spheres_raw
 0
-throw_unless(nk==8,"failed")
-exit(1)
+exit_unless(nk==8,"failed")
+exit(0)

pub/ftest/ternary.f2t

 #!/usr/bin/env frida
-throw_unless(0?2:3==3,"cond_expr_failed")
-throw_unless(1?4:5==4,"cond_expr_failed")
-exit(1)
+exit_unless(0?2:3==3,"cond_expr_failed")
+exit_unless(1?4:5==4,"cond_expr_failed")
+exit(0)

pub/lib/fbase.cpp

@@ -169,8 +169,8 @@ double func_diehl( double a ) {
 
 int func_exit( int a ) { exit(a); return 0; }
 
-int func_throw_if( int a, string s ) { if(a) throw s; return 0; }
-int func_throw_unless( int a, string s ) { if(!a) throw s; return 0; }
+int func_exit_if( int a, string s ) { if(a) { cerr << s << "\n"; exit(1); } return 0; }
+int func_exit_unless( int a, string s ) { return func_exit_if( !a, s ); }
 
 //**************************************************************************************************
 //*  Functions of two arguments
@@ -591,10 +591,10 @@ void fbase_initialize()
     G->register_fct_d_d  ( "lndiehl", func_lndiehl );
 
     // f(2 args)
-    G->register_fct_meta ( "throw_if", 2, "(x,s): throw s if x" );
-    G->register_fct_i_is ( "throw_if", func_throw_if );
-    G->register_fct_meta ( "throw_unless", 1, "(x,s): throw s if !x" );
-    G->register_fct_i_is ( "throw_unless", func_throw_unless );
+    G->register_fct_meta ( "exit_if", 2, "(x,s): throw s if x" );
+    G->register_fct_i_is ( "exit_if", func_exit_if );
+    G->register_fct_meta ( "exit_unless", 1, "(x,s): throw s if !x" );
+    G->register_fct_i_is ( "exit_unless", func_exit_unless );
     G->register_fct_meta ( "min2", 2, "(x,y): the smaller of the two arguments x and y" );
     G->register_fct_i_ii ( "min2", func_min );
     G->register_fct_d_dd ( "min2", func_min );

pub/utest/CMakeLists.txt

-# CMake build script for Tests
+# To run the tests on Linux, use 'make test' or 'ctest'.
+# To select which tests to run, use 'ctest -R regex'.
+# To see output from the individual tests, use 'ctest -V'.
+# For more options, run 'ctest --help'.
 
 include(cmake/utils.cmake) # defines cxx_executable, cxx_test
 
 enable_testing()
 
-# To run the tests on Linux, use 'make test' or 'ctest'.
-# You can select which tests to run using 'ctest -R regex'.
-# For more options, run 'ctest --help'.
-
 include_directories(
     ${gtest_SOURCE_DIR}/include
     ${gtest_SOURCE_DIR}
@@ -32,7 +31,7 @@ set(test_link_libs
     )
 
 # We glob test sources, though this is often considered evil.
-# Just touch Tests/CMakeLists.txt each time a test is added or withdrawn.
+# Just touch CMakeLists.txt each time a test is added or withdrawn.
 
 file(GLOB test_sources "test[0-9]*.cpp")