Reorganise tests into cram and unit tests.

Author: tmcgilchrist

test/dune

@@ -1,74 +1,57 @@
-; run menhir test
+; ; run menhir test
+
+; (executable
+;  (name test_gc_stats)
+;  (modules test_gc_stats))
+
+; (executable
+;  (name test_fib)
+;  (modules test_fib)
+;  (enabled_if
+;   (>= %{ocaml_version} 5.1.0))
+;  (libraries runtime_events unix))
+
+; (rule
+;  (alias runtest)
+;  (package runtime_events_tools)
+;  (deps %{bin:olly} test_gc_stats.exe)
+;  (action
+;   (run olly gc-stats "./test_gc_stats.exe")))
+
+; (rule
+;  (alias runtest)
+;  (package runtime_events_tools)
+;  (deps %{bin:olly} test_gc_stats.exe)
+;  (action
+;   (run olly gc-stats ./test_gc_stats.exe 19)))
+
+; (rule
+;  (alias runtest)
+;  (package runtime_events_tools)
+;  (enabled_if
+;   (>= %{ocaml_version} 5.1.0))
+;  (deps %{bin:olly} test_fib.exe)
+;  (action
+;   (progn
+;    (run olly trace test.trace ./test_fib.exe))))
+
+; (rule
+;  (alias runtest)
+;  (package runtime_events_tools)
+;  (enabled_if
+;   (>= %{ocaml_version} 5.1.0))
+;  (deps %{bin:olly} test_fib.exe)
+;  (action
+;   (progn
+;    (run olly trace --format=json test-json.trace ./test_fib.exe))))
+
+; (rule
+;  (alias runtest)
+;  (package runtime_events_tools_bare)
+;  (enabled_if
+;   (>= %{ocaml_version} 5.1.0))
+;  (deps %{bin:olly_bare} test_fib.exe)
+;  (action
+;   (progn
+;    (run olly_bare trace --format=json test-bare-json.trace ./test_fib.exe))))
 
-(executable
- (name test_gc_stats)
- (modules test_gc_stats))
-
-(executable
- (name test_fib)
- (modules test_fib)
- (enabled_if
-  (>= %{ocaml_version} 5.1.0))
- (libraries runtime_events unix))
-
-(rule
- (alias runtest)
- (package runtime_events_tools)
- (deps %{bin:olly} test_gc_stats.exe)
- (action
-  (run olly gc-stats "./test_gc_stats.exe")))
-
-(rule
- (alias runtest)
- (package runtime_events_tools)
- (deps %{bin:olly} test_gc_stats.exe)
- (action
-  (run olly gc-stats ./test_gc_stats.exe 19)))
-
-(rule
- (alias runtest)
- (package runtime_events_tools)
- (enabled_if
-  (>= %{ocaml_version} 5.1.0))
- (deps %{bin:olly} test_fib.exe)
- (action
-  (progn
-   (run olly trace test.trace ./test_fib.exe))))
-
-(rule
- (alias runtest)
- (package runtime_events_tools)
- (enabled_if
-  (>= %{ocaml_version} 5.1.0))
- (deps %{bin:olly} test_fib.exe)
- (action
-  (progn
-   (run olly trace --format=json test-json.trace ./test_fib.exe))))
-
-(rule
- (alias runtest)
- (package runtime_events_tools_bare)
- (enabled_if
-  (>= %{ocaml_version} 5.1.0))
- (deps %{bin:olly_bare} test_fib.exe)
- (action
-  (progn
-   (run olly_bare trace --format=json test-bare-json.trace ./test_fib.exe))))
-
-; Dummy process for testing process launching.
-
-(executables
- (names run_endlessly)
- (modules run_endlessly)
- (libraries unix))
-
-(test
- (name test_launch)
- (modules test_launch)
- (package runtime_events_tools)
- (enabled_if
-  (>= %{ocaml_version} 5.1.0))
- (libraries olly_common alcotest)
- (deps run_endlessly.exe)
- (action
-  (run %{test} --show-errors)))

test/unit/dune

@@ -0,0 +1,17 @@
+; Dummy process for testing process launching.
+
+(executables
+ (names run_endlessly)
+ (modules run_endlessly)
+ (libraries unix))
+
+(test
+ (name test_launch)
+ (modules test_launch)
+ (package runtime_events_tools)
+ (enabled_if
+  (>= %{ocaml_version} 5.1.0))
+ (libraries olly_common alcotest)
+ (deps run_endlessly.exe)
+ (action
+  (run %{test} --show-errors)))

test/run_endlessly.ml renamed to test/unit/run_endlessly.ml

@@ -21,7 +21,7 @@ let process_launch_failure () =
 
 let process_launch () =
   let open Olly_common in
-  let config = { Launch.log_wsize = None; dir = None } in
+  let config = { Launch.log_wsize = None; dir = Some "./" } in
   Alcotest.(check bool)
     "process should launch" true
     (try
@@ -42,7 +42,7 @@ let process_launch () =
 
 let () =
   let open Alcotest in
-  run "Runtime Events Tools"
+  run "Runtime-events-tools"
     [
       ( "process",
         [