update lines and dune file - preparing to rebase on main

Author: Lucccyo

src/sys/dune

@@ -2,21 +2,11 @@
 
 ;; this prevents the tests from running on a default build
 
-(alias
- (name default)
- (package multicoretests)
- (deps stm_tests.exe))
-
-(executable
+(test
  (name stm_tests)
  (modules stm_tests)
- (libraries qcheck-stm.sequential qcheck-stm.domain)
- (preprocess
-  (pps ppx_deriving.show)))
-
-(rule
- (alias runtest)
  (package multicoretests)
- (deps stm_tests.exe)
- (action
-  (run ./%{deps} --verbose)))
+ (libraries qcheck-stm.sequential qcheck-stm.domain)
+ (preprocess (pps ppx_deriving.show))
+ (action (run %{test} --verbose))
+)

src/sys/stm_tests.ml

@@ -1,5 +1,5 @@
 open QCheck
-open STM_base
+open STM
 
 module SConf =
 struct
@@ -32,10 +32,10 @@ struct
     QCheck.make ~print:show_cmd
       Gen.(oneof
             [
-                map (fun path -> File_exists (path)) path_gen ;
+                map (fun path -> File_exists path) path_gen ;
                 map3 (fun path new_dir_name perm -> Mkdir (path, new_dir_name, perm)) path_gen name_gen perm_gen;
                 map2 (fun path delete_dir_name -> Rmdir (path, delete_dir_name)) path_gen name_gen;
-                map (fun path -> Readdir (path)) path_gen;
+                map (fun path -> Readdir path) path_gen;
                 map3 (fun path new_file_name perm -> Touch (path, new_file_name, perm)) path_gen name_gen perm_gen;
             ])
 
@@ -127,7 +127,7 @@ struct
 
   let next_state c fs =
     match c with
-    | File_exists (_path) -> fs
+    | File_exists _path -> fs
     | Mkdir (path, new_dir_name, perm) ->
       if mem fs (path @ [new_dir_name])
       then fs
@@ -163,12 +163,12 @@ struct
 
   let run c _file_name =
     match c with
-    | File_exists (path) -> Res (bool, Sys.file_exists (p path))
+    | File_exists path -> Res (bool, Sys.file_exists (p path))
     | Mkdir (path, new_dir_name, perm) ->
       Res (result unit exn, protect (Sys.mkdir ((p path) / new_dir_name)) perm)
     | Rmdir (path, delete_dir_name) ->
       Res (result unit exn, protect (Sys.rmdir) ((p path) / delete_dir_name))
-    | Readdir (path) ->
+    | Readdir path ->
       Res (result (array string) exn, protect (Sys.readdir) (p path))
     | Touch (path, new_file_name, _perm) ->
         (match Sys.os_type with
@@ -185,7 +185,7 @@ struct
 
   let postcond c (fs: filesys) res =
     match c, res with
-    | File_exists (path), Res ((Bool,_),b) -> b = mem fs path
+    | File_exists path, Res ((Bool,_),b) -> b = mem fs path
     | Mkdir (path, new_dir_name, _perm), Res ((Result (Unit,Exn),_), res) ->
       let complete_path = (path @ [new_dir_name]) in
       (match res with
@@ -202,16 +202,15 @@ struct
       let complete_path = (path @ [delete_dir_name]) in
       (match res with
        | Error err ->
-         (match err with
+        (match err with
            | Sys_error s ->
              (s = (p complete_path) ^ ": Directory not empty" && not (readdir fs complete_path = Some [])) ||
              (s = (p complete_path) ^ ": No such file or directory" && not (mem fs complete_path)) ||
              (s = (p complete_path) ^ ": Not a directory" && not (path_is_a_dir fs complete_path))
            | _ -> false)
         | Ok () ->
-          let is_empty = readdir fs complete_path = Some [] in
-          mem fs complete_path && is_empty && path_is_a_dir fs complete_path)
-    | Readdir (path), Res ((Result (Array String,Exn),_), res) ->
+          mem fs complete_path && path_is_a_dir fs complete_path && readdir fs complete_path = Some [])
+    | Readdir path, Res ((Result (Array String,Exn),_), res) ->
       (match res with
        | Error err ->
          (match err with
@@ -226,7 +225,7 @@ struct
             (match readdir fs path with
             | None   -> false
             | Some l -> List.sort (fun a b -> -(String.compare a b)) l = sut) in
-          same_result && mem fs path && path_is_a_dir fs path)
+            mem fs path && path_is_a_dir fs path && same_result)
     | Touch (_path, _new_dir_name, _perm), Res ((Unit,_),_) -> true
     | _,_ -> false
 end