Skip AssertCodePosition test if no debug symbols are available. (Closes…

…: #21).
gildor478 · Dec 19, 2020 · 4e25966 · 4e25966
1 parent 84086bd
commit 4e25966
Show file tree

Hide file tree

Showing 18 changed files with 67 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+## v2.2.4 - 2020-12-20
+
+### Fixed
+- Skip AssertCodePosition test if no debug symbols are available. (Closes: #21)
+
 ## v2.2.3 - 2020-07-11
 
 ### Changed

diff --git a/test/dune b/test/dune
@@ -1,6 +1,6 @@
 (test
   (name test)
-  (libraries ounit2 ounit2.advanced str testcommon)
+  (libraries ounit2 ounit2.advanced str libtest)
   (package ounit2)
   (deps
     test.exe

diff --git a/test/libtest/dune b/test/libtest/dune
@@ -0,0 +1,4 @@
+(library
+  (name libtest)
+  (wrapped false)
+  (libraries ounit2 ounit2.advanced testcommon))
diff --git a/test/testCommon.ml → test/libtest/testCommon.ml b/test/testCommon.ml → test/libtest/testCommon.ml
diff --git a/test/testConf.ml → test/libtest/testConf.ml b/test/testConf.ml → test/libtest/testConf.ml
diff --git a/test/testOUnit1.ml → test/libtest/testOUnit1.ml b/test/testOUnit1.ml → test/libtest/testOUnit1.ml
diff --git a/test/testOUnit2.ml → test/libtest/testOUnit2.ml b/test/testOUnit2.ml → test/libtest/testOUnit2.ml
diff --git a/test/testOUnitAssert.ml → test/libtest/testOUnitAssert.ml b/test/testOUnitAssert.ml → test/libtest/testOUnitAssert.ml
diff --git a/test/testOUnitBracket.ml → test/libtest/testOUnitBracket.ml b/test/testOUnitBracket.ml → test/libtest/testOUnitBracket.ml
diff --git a/test/testOUnitChooser.ml → test/libtest/testOUnitChooser.ml b/test/testOUnitChooser.ml → test/libtest/testOUnitChooser.ml
diff --git a/test/testOUnitDiff.ml → test/libtest/testOUnitDiff.ml b/test/testOUnitDiff.ml → test/libtest/testOUnitDiff.ml
diff --git a/test/testOUnitTest.ml → test/libtest/testOUnitTest.ml b/test/testOUnitTest.ml → test/libtest/testOUnitTest.ml
diff --git a/test/testOtherTests.ml → test/libtest/testOtherTests.ml b/test/testOtherTests.ml → test/libtest/testOtherTests.ml
@@ -145,11 +145,16 @@ let tests =
               characters 11-24",
              Some ("src/oUnitRunner.ml", 14);
            ]);
+  ]
 
 
+let test_assert_code_position =
       "AssertCodePosition" >::
       (fun ctxt ->
          skip_if (not (Printexc.backtrace_status ())) "No backtrace.";
+         skip_if
+          ((Printexc.get_backtrace ()) = "Called from unknown location\n")
+          "No debug symbols available";
          let extract_exc e =
            let _, result, _ = OUnitTest.result_full_of_exception ctxt e in
            match result with
@@ -168,8 +173,7 @@ let tests =
          let fn2, lineno2 =
            try assert_equal 2 1; "", 0 with e -> extract_exc e
          in
-         let fn_exp = "test/testOtherTests.ml" in
+         let fn_exp = "test/libtest/testOtherTests.ml" in
            assert_equal ~printer:(fun s -> s) fn_exp fn1;
            assert_equal ~printer:(fun s -> s) fn_exp fn2;
-           assert_equal ~printer:string_of_int 3 (lineno2 - lineno1));
-  ]
+           assert_equal ~printer:string_of_int 3 (lineno2 - lineno1))
diff --git a/test/testRunner.ml → test/libtest/testRunner.ml b/test/testRunner.ml → test/libtest/testRunner.ml
diff --git a/test/testShared.ml → test/libtest/testShared.ml b/test/testShared.ml → test/libtest/testShared.ml
diff --git a/test/test.ml b/test/test.ml
@@ -47,5 +47,6 @@ let () =
        TestShared.tests;
        TestOUnitBracket.tests;
        TestOUnitChooser.tests;
+       TestOtherTests.test_assert_code_position;
      ])
 
diff --git a/test/test_byte/dune b/test/test_byte/dune
@@ -0,0 +1,8 @@
+(test
+  (name test_byte)
+  (libraries ounit2 ounit2.advanced str libtest)
+  (package ounit2)
+  (modes byte)
+  (deps test_byte.bc)
+  (action (run env OCAMLRUNPARAM=b %{test})))
+
diff --git a/test/test_byte/test_byte.ml b/test/test_byte/test_byte.ml
@@ -0,0 +1,41 @@
+(**************************************************************************)
+(* The OUnit library                                                      *)
+(*                                                                        *)
+(* Copyright (C) 2002-2008 Maas-Maarten Zeeman.                           *)
+(* Copyright (C) 2010 OCamlCore SARL                                      *)
+(* Copyright (C) 2013 Sylvain Le Gall                                     *)
+(*                                                                        *)
+(* The package OUnit is copyright by Maas-Maarten Zeeman, OCamlCore SARL  *)
+(* and Sylvain Le Gall.                                                   *)
+(*                                                                        *)
+(* Permission is hereby granted, free of charge, to any person obtaining  *)
+(* a copy of this document and the OUnit software ("the Software"), to    *)
+(* deal in the Software without restriction, including without limitation *)
+(* the rights to use, copy, modify, merge, publish, distribute,           *)
+(* sublicense, and/or sell copies of the Software, and to permit persons  *)
+(* to whom the Software is furnished to do so, subject to the following   *)
+(* conditions:                                                            *)
+(*                                                                        *)
+(* The above copyright notice and this permission notice shall be         *)
+(* included in all copies or substantial portions of the Software.        *)
+(*                                                                        *)
+(* The Software is provided ``as is'', without warranty of any kind,      *)
+(* express or implied, including but not limited to the warranties of     *)
+(* merchantability, fitness for a particular purpose and noninfringement. *)
+(* In no event shall Maas-Maarten Zeeman be liable for any claim, damages *)
+(* or other liability, whether in an action of contract, tort or          *)
+(* otherwise, arising from, out of or in connection with the Software or  *)
+(* the use or other dealings in the software.                             *)
+(*                                                                        *)
+(* See LICENSE.txt for details.                                           *)
+(**************************************************************************)
+
+open OUnit2
+
+let () =
+  run_test_tt_main
+    ("OUnitByte" >:::
+     [
+       TestOtherTests.test_assert_code_position;
+     ])
+