Skip to content

Commit

Permalink
Reorganize tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrenth
andrenth committed Feb 5, 2015
1 parent 16aa09e commit b1fbd01
Show file tree
Hide file tree
Showing 18 changed files with 226 additions and 201 deletions.
40 changes: 20 additions & 20 deletions _oasis
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,80 +77,80 @@ Document "release"
XOCamlbuildLibraries: release

Executable "async_test_master"
Path: lib_test
MainIs: master_async.ml
Path: lib_test/async
MainIs: master.ml
Install: false
CompiledObject: best
BuildDepends: release.async,
str

Executable "async_test_slave"
Path: lib_test
MainIs: slave_async.ml
Path: lib_test/async
MainIs: slave.ml
Install: false
CompiledObject: best
BuildDepends: release.async,
str

Executable "async_test_helper"
Path: lib_test
MainIs: helper_async.ml
Path: lib_test/async
MainIs: helper.ml
Install: false
CompiledObject: best
BuildDepends: release.async,
str

Executable "async_masterctl"
Path: lib_test
MainIs: masterctl_async.ml
Path: lib_test/async
MainIs: masterctl.ml
Install: false
CompiledObject: best
BuildDepends: release.async,
str

Executable "async_test_config"
Path: lib_test/config
MainIs: config_test_async.ml
Path: lib_test/async/config
MainIs: config_test.ml
Install: false
CompiledObject: best
BuildTools+: ocamllex, ocamlyacc
BuildDepends: release.async

Executable "lwt_test_master"
Path: lib_test
MainIs: master_lwt.ml
Path: lib_test/lwt
MainIs: master.ml
Install: false
CompiledObject: best
BuildDepends: release.lwt,
str

Executable "lwt_test_slave"
Path: lib_test
MainIs: slave_lwt.ml
Path: lib_test/lwt
MainIs: slave.ml
Install: false
CompiledObject: best
BuildDepends: release.lwt,
str

Executable "lwt_test_helper"
Path: lib_test
MainIs: helper_lwt.ml
Path: lib_test/lwt
MainIs: helper.ml
Install: false
CompiledObject: best
BuildDepends: release.lwt,
str

Executable "lwt_masterctl"
Path: lib_test
MainIs: masterctl_lwt.ml
Path: lib_test/lwt
MainIs: masterctl.ml
Install: false
CompiledObject: best
BuildDepends: release.lwt,
str

Executable "lwt_test_config"
Path: lib_test/config
MainIs: config_test_lwt.ml
Path: lib_test/lwt/config
MainIs: config_test.ml
Install: false
CompiledObject: best
BuildTools+: ocamllex, ocamlyacc
Expand Down
256 changes: 134 additions & 122 deletions _tags
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: 2cf5c4ccba1bd0708cc3298a6a83d3c9)
# DO NOT EDIT (digest: 2eca7183f3d996490d43fcc077916c02)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
Expand Down Expand Up @@ -43,136 +43,148 @@ true: annot, bin_annot
<lib/lwt/*.ml{,i,y}>: pkg_unix
<lib/lwt/*.ml{,i,y}>: use_release
# Executable async_test_master
<lib_test/master_async.{native,byte}>: pkg_async
<lib_test/master_async.{native,byte}>: pkg_async_extended
<lib_test/master_async.{native,byte}>: pkg_str
<lib_test/master_async.{native,byte}>: pkg_threads
<lib_test/master_async.{native,byte}>: pkg_uint.uint128
<lib_test/master_async.{native,byte}>: pkg_uint.uint32
<lib_test/master_async.{native,byte}>: pkg_uint.uint64
<lib_test/master_async.{native,byte}>: pkg_unix
<lib_test/master_async.{native,byte}>: use_release
<lib_test/master_async.{native,byte}>: use_release-async
<lib_test/async/master.{native,byte}>: pkg_async
<lib_test/async/master.{native,byte}>: pkg_async_extended
<lib_test/async/master.{native,byte}>: pkg_str
<lib_test/async/master.{native,byte}>: pkg_threads
<lib_test/async/master.{native,byte}>: pkg_uint.uint128
<lib_test/async/master.{native,byte}>: pkg_uint.uint32
<lib_test/async/master.{native,byte}>: pkg_uint.uint64
<lib_test/async/master.{native,byte}>: pkg_unix
<lib_test/async/master.{native,byte}>: use_release
<lib_test/async/master.{native,byte}>: use_release-async
# Executable async_test_slave
<lib_test/slave_async.{native,byte}>: pkg_async
<lib_test/slave_async.{native,byte}>: pkg_async_extended
<lib_test/slave_async.{native,byte}>: pkg_str
<lib_test/slave_async.{native,byte}>: pkg_threads
<lib_test/slave_async.{native,byte}>: pkg_uint.uint128
<lib_test/slave_async.{native,byte}>: pkg_uint.uint32
<lib_test/slave_async.{native,byte}>: pkg_uint.uint64
<lib_test/slave_async.{native,byte}>: pkg_unix
<lib_test/slave_async.{native,byte}>: use_release
<lib_test/slave_async.{native,byte}>: use_release-async
<lib_test/async/slave.{native,byte}>: pkg_async
<lib_test/async/slave.{native,byte}>: pkg_async_extended
<lib_test/async/slave.{native,byte}>: pkg_str
<lib_test/async/slave.{native,byte}>: pkg_threads
<lib_test/async/slave.{native,byte}>: pkg_uint.uint128
<lib_test/async/slave.{native,byte}>: pkg_uint.uint32
<lib_test/async/slave.{native,byte}>: pkg_uint.uint64
<lib_test/async/slave.{native,byte}>: pkg_unix
<lib_test/async/slave.{native,byte}>: use_release
<lib_test/async/slave.{native,byte}>: use_release-async
# Executable async_test_helper
<lib_test/helper_async.{native,byte}>: pkg_async
<lib_test/helper_async.{native,byte}>: pkg_async_extended
<lib_test/helper_async.{native,byte}>: pkg_str
<lib_test/helper_async.{native,byte}>: pkg_threads
<lib_test/helper_async.{native,byte}>: pkg_uint.uint128
<lib_test/helper_async.{native,byte}>: pkg_uint.uint32
<lib_test/helper_async.{native,byte}>: pkg_uint.uint64
<lib_test/helper_async.{native,byte}>: pkg_unix
<lib_test/helper_async.{native,byte}>: use_release
<lib_test/helper_async.{native,byte}>: use_release-async
<lib_test/async/helper.{native,byte}>: pkg_async
<lib_test/async/helper.{native,byte}>: pkg_async_extended
<lib_test/async/helper.{native,byte}>: pkg_str
<lib_test/async/helper.{native,byte}>: pkg_threads
<lib_test/async/helper.{native,byte}>: pkg_uint.uint128
<lib_test/async/helper.{native,byte}>: pkg_uint.uint32
<lib_test/async/helper.{native,byte}>: pkg_uint.uint64
<lib_test/async/helper.{native,byte}>: pkg_unix
<lib_test/async/helper.{native,byte}>: use_release
<lib_test/async/helper.{native,byte}>: use_release-async
# Executable async_masterctl
<lib_test/masterctl_async.{native,byte}>: pkg_async
<lib_test/masterctl_async.{native,byte}>: pkg_async_extended
<lib_test/masterctl_async.{native,byte}>: pkg_str
<lib_test/masterctl_async.{native,byte}>: pkg_threads
<lib_test/masterctl_async.{native,byte}>: pkg_uint.uint128
<lib_test/masterctl_async.{native,byte}>: pkg_uint.uint32
<lib_test/masterctl_async.{native,byte}>: pkg_uint.uint64
<lib_test/masterctl_async.{native,byte}>: pkg_unix
<lib_test/masterctl_async.{native,byte}>: use_release
<lib_test/masterctl_async.{native,byte}>: use_release-async
<lib_test/*.ml{,i,y}>: pkg_async
<lib_test/*.ml{,i,y}>: pkg_async_extended
<lib_test/*.ml{,i,y}>: pkg_threads
<lib_test/*.ml{,i,y}>: use_release-async
<lib_test/async/masterctl.{native,byte}>: pkg_async
<lib_test/async/masterctl.{native,byte}>: pkg_async_extended
<lib_test/async/masterctl.{native,byte}>: pkg_str
<lib_test/async/masterctl.{native,byte}>: pkg_threads
<lib_test/async/masterctl.{native,byte}>: pkg_uint.uint128
<lib_test/async/masterctl.{native,byte}>: pkg_uint.uint32
<lib_test/async/masterctl.{native,byte}>: pkg_uint.uint64
<lib_test/async/masterctl.{native,byte}>: pkg_unix
<lib_test/async/masterctl.{native,byte}>: use_release
<lib_test/async/masterctl.{native,byte}>: use_release-async
<lib_test/async/*.ml{,i,y}>: pkg_async
<lib_test/async/*.ml{,i,y}>: pkg_async_extended
<lib_test/async/*.ml{,i,y}>: pkg_str
<lib_test/async/*.ml{,i,y}>: pkg_threads
<lib_test/async/*.ml{,i,y}>: pkg_uint.uint128
<lib_test/async/*.ml{,i,y}>: pkg_uint.uint32
<lib_test/async/*.ml{,i,y}>: pkg_uint.uint64
<lib_test/async/*.ml{,i,y}>: pkg_unix
<lib_test/async/*.ml{,i,y}>: use_release
<lib_test/async/*.ml{,i,y}>: use_release-async
# Executable async_test_config
<lib_test/config/config_test_async.{native,byte}>: pkg_async
<lib_test/config/config_test_async.{native,byte}>: pkg_async_extended
<lib_test/config/config_test_async.{native,byte}>: pkg_str
<lib_test/config/config_test_async.{native,byte}>: pkg_threads
<lib_test/config/config_test_async.{native,byte}>: pkg_uint.uint128
<lib_test/config/config_test_async.{native,byte}>: pkg_uint.uint32
<lib_test/config/config_test_async.{native,byte}>: pkg_uint.uint64
<lib_test/config/config_test_async.{native,byte}>: pkg_unix
<lib_test/config/config_test_async.{native,byte}>: use_release
<lib_test/config/config_test_async.{native,byte}>: use_release-async
<lib_test/config/*.ml{,i,y}>: pkg_async
<lib_test/config/*.ml{,i,y}>: pkg_async_extended
<lib_test/config/*.ml{,i,y}>: pkg_threads
<lib_test/config/*.ml{,i,y}>: use_release-async
<lib_test/async/config/config_test.{native,byte}>: pkg_async
<lib_test/async/config/config_test.{native,byte}>: pkg_async_extended
<lib_test/async/config/config_test.{native,byte}>: pkg_str
<lib_test/async/config/config_test.{native,byte}>: pkg_threads
<lib_test/async/config/config_test.{native,byte}>: pkg_uint.uint128
<lib_test/async/config/config_test.{native,byte}>: pkg_uint.uint32
<lib_test/async/config/config_test.{native,byte}>: pkg_uint.uint64
<lib_test/async/config/config_test.{native,byte}>: pkg_unix
<lib_test/async/config/config_test.{native,byte}>: use_release
<lib_test/async/config/config_test.{native,byte}>: use_release-async
<lib_test/async/config/*.ml{,i,y}>: pkg_async
<lib_test/async/config/*.ml{,i,y}>: pkg_async_extended
<lib_test/async/config/*.ml{,i,y}>: pkg_str
<lib_test/async/config/*.ml{,i,y}>: pkg_threads
<lib_test/async/config/*.ml{,i,y}>: pkg_uint.uint128
<lib_test/async/config/*.ml{,i,y}>: pkg_uint.uint32
<lib_test/async/config/*.ml{,i,y}>: pkg_uint.uint64
<lib_test/async/config/*.ml{,i,y}>: pkg_unix
<lib_test/async/config/*.ml{,i,y}>: use_release
<lib_test/async/config/*.ml{,i,y}>: use_release-async
# Executable lwt_test_master
<lib_test/master_lwt.{native,byte}>: pkg_lwt
<lib_test/master_lwt.{native,byte}>: pkg_lwt.unix
<lib_test/master_lwt.{native,byte}>: pkg_str
<lib_test/master_lwt.{native,byte}>: pkg_uint.uint128
<lib_test/master_lwt.{native,byte}>: pkg_uint.uint32
<lib_test/master_lwt.{native,byte}>: pkg_uint.uint64
<lib_test/master_lwt.{native,byte}>: pkg_unix
<lib_test/master_lwt.{native,byte}>: use_release
<lib_test/master_lwt.{native,byte}>: use_release-lwt
<lib_test/lwt/master.{native,byte}>: pkg_lwt
<lib_test/lwt/master.{native,byte}>: pkg_lwt.unix
<lib_test/lwt/master.{native,byte}>: pkg_str
<lib_test/lwt/master.{native,byte}>: pkg_uint.uint128
<lib_test/lwt/master.{native,byte}>: pkg_uint.uint32
<lib_test/lwt/master.{native,byte}>: pkg_uint.uint64
<lib_test/lwt/master.{native,byte}>: pkg_unix
<lib_test/lwt/master.{native,byte}>: use_release
<lib_test/lwt/master.{native,byte}>: use_release-lwt
# Executable lwt_test_slave
<lib_test/slave_lwt.{native,byte}>: pkg_lwt
<lib_test/slave_lwt.{native,byte}>: pkg_lwt.unix
<lib_test/slave_lwt.{native,byte}>: pkg_str
<lib_test/slave_lwt.{native,byte}>: pkg_uint.uint128
<lib_test/slave_lwt.{native,byte}>: pkg_uint.uint32
<lib_test/slave_lwt.{native,byte}>: pkg_uint.uint64
<lib_test/slave_lwt.{native,byte}>: pkg_unix
<lib_test/slave_lwt.{native,byte}>: use_release
<lib_test/slave_lwt.{native,byte}>: use_release-lwt
<lib_test/lwt/slave.{native,byte}>: pkg_lwt
<lib_test/lwt/slave.{native,byte}>: pkg_lwt.unix
<lib_test/lwt/slave.{native,byte}>: pkg_str
<lib_test/lwt/slave.{native,byte}>: pkg_uint.uint128
<lib_test/lwt/slave.{native,byte}>: pkg_uint.uint32
<lib_test/lwt/slave.{native,byte}>: pkg_uint.uint64
<lib_test/lwt/slave.{native,byte}>: pkg_unix
<lib_test/lwt/slave.{native,byte}>: use_release
<lib_test/lwt/slave.{native,byte}>: use_release-lwt
# Executable lwt_test_helper
<lib_test/helper_lwt.{native,byte}>: pkg_lwt
<lib_test/helper_lwt.{native,byte}>: pkg_lwt.unix
<lib_test/helper_lwt.{native,byte}>: pkg_str
<lib_test/helper_lwt.{native,byte}>: pkg_uint.uint128
<lib_test/helper_lwt.{native,byte}>: pkg_uint.uint32
<lib_test/helper_lwt.{native,byte}>: pkg_uint.uint64
<lib_test/helper_lwt.{native,byte}>: pkg_unix
<lib_test/helper_lwt.{native,byte}>: use_release
<lib_test/helper_lwt.{native,byte}>: use_release-lwt
<lib_test/lwt/helper.{native,byte}>: pkg_lwt
<lib_test/lwt/helper.{native,byte}>: pkg_lwt.unix
<lib_test/lwt/helper.{native,byte}>: pkg_str
<lib_test/lwt/helper.{native,byte}>: pkg_uint.uint128
<lib_test/lwt/helper.{native,byte}>: pkg_uint.uint32
<lib_test/lwt/helper.{native,byte}>: pkg_uint.uint64
<lib_test/lwt/helper.{native,byte}>: pkg_unix
<lib_test/lwt/helper.{native,byte}>: use_release
<lib_test/lwt/helper.{native,byte}>: use_release-lwt
# Executable lwt_masterctl
<lib_test/masterctl_lwt.{native,byte}>: pkg_lwt
<lib_test/masterctl_lwt.{native,byte}>: pkg_lwt.unix
<lib_test/masterctl_lwt.{native,byte}>: pkg_str
<lib_test/masterctl_lwt.{native,byte}>: pkg_uint.uint128
<lib_test/masterctl_lwt.{native,byte}>: pkg_uint.uint32
<lib_test/masterctl_lwt.{native,byte}>: pkg_uint.uint64
<lib_test/masterctl_lwt.{native,byte}>: pkg_unix
<lib_test/masterctl_lwt.{native,byte}>: use_release
<lib_test/masterctl_lwt.{native,byte}>: use_release-lwt
<lib_test/*.ml{,i,y}>: pkg_lwt
<lib_test/*.ml{,i,y}>: pkg_lwt.unix
<lib_test/*.ml{,i,y}>: pkg_str
<lib_test/*.ml{,i,y}>: pkg_uint.uint128
<lib_test/*.ml{,i,y}>: pkg_uint.uint32
<lib_test/*.ml{,i,y}>: pkg_uint.uint64
<lib_test/*.ml{,i,y}>: pkg_unix
<lib_test/*.ml{,i,y}>: use_release
<lib_test/*.ml{,i,y}>: use_release-lwt
<lib_test/lwt/masterctl.{native,byte}>: pkg_lwt
<lib_test/lwt/masterctl.{native,byte}>: pkg_lwt.unix
<lib_test/lwt/masterctl.{native,byte}>: pkg_str
<lib_test/lwt/masterctl.{native,byte}>: pkg_uint.uint128
<lib_test/lwt/masterctl.{native,byte}>: pkg_uint.uint32
<lib_test/lwt/masterctl.{native,byte}>: pkg_uint.uint64
<lib_test/lwt/masterctl.{native,byte}>: pkg_unix
<lib_test/lwt/masterctl.{native,byte}>: use_release
<lib_test/lwt/masterctl.{native,byte}>: use_release-lwt
<lib_test/lwt/*.ml{,i,y}>: pkg_lwt
<lib_test/lwt/*.ml{,i,y}>: pkg_lwt.unix
<lib_test/lwt/*.ml{,i,y}>: pkg_str
<lib_test/lwt/*.ml{,i,y}>: pkg_uint.uint128
<lib_test/lwt/*.ml{,i,y}>: pkg_uint.uint32
<lib_test/lwt/*.ml{,i,y}>: pkg_uint.uint64
<lib_test/lwt/*.ml{,i,y}>: pkg_unix
<lib_test/lwt/*.ml{,i,y}>: use_release
<lib_test/lwt/*.ml{,i,y}>: use_release-lwt
# Executable lwt_test_config
<lib_test/config/config_test_lwt.{native,byte}>: pkg_lwt
<lib_test/config/config_test_lwt.{native,byte}>: pkg_lwt.unix
<lib_test/config/config_test_lwt.{native,byte}>: pkg_str
<lib_test/config/config_test_lwt.{native,byte}>: pkg_uint.uint128
<lib_test/config/config_test_lwt.{native,byte}>: pkg_uint.uint32
<lib_test/config/config_test_lwt.{native,byte}>: pkg_uint.uint64
<lib_test/config/config_test_lwt.{native,byte}>: pkg_unix
<lib_test/config/config_test_lwt.{native,byte}>: use_release
<lib_test/config/config_test_lwt.{native,byte}>: use_release-lwt
<lib_test/config/*.ml{,i,y}>: pkg_lwt
<lib_test/config/*.ml{,i,y}>: pkg_lwt.unix
<lib_test/config/*.ml{,i,y}>: pkg_str
<lib_test/config/*.ml{,i,y}>: pkg_uint.uint128
<lib_test/config/*.ml{,i,y}>: pkg_uint.uint32
<lib_test/config/*.ml{,i,y}>: pkg_uint.uint64
<lib_test/config/*.ml{,i,y}>: pkg_unix
<lib_test/config/*.ml{,i,y}>: use_release
<lib_test/config/*.ml{,i,y}>: use_release-lwt
<lib_test/lwt/config/config_test.{native,byte}>: pkg_lwt
<lib_test/lwt/config/config_test.{native,byte}>: pkg_lwt.unix
<lib_test/lwt/config/config_test.{native,byte}>: pkg_str
<lib_test/lwt/config/config_test.{native,byte}>: pkg_uint.uint128
<lib_test/lwt/config/config_test.{native,byte}>: pkg_uint.uint32
<lib_test/lwt/config/config_test.{native,byte}>: pkg_uint.uint64
<lib_test/lwt/config/config_test.{native,byte}>: pkg_unix
<lib_test/lwt/config/config_test.{native,byte}>: use_release
<lib_test/lwt/config/config_test.{native,byte}>: use_release-lwt
<lib_test/lwt/config/*.ml{,i,y}>: pkg_lwt
<lib_test/lwt/config/*.ml{,i,y}>: pkg_lwt.unix
<lib_test/lwt/config/*.ml{,i,y}>: pkg_str
<lib_test/lwt/config/*.ml{,i,y}>: pkg_uint.uint128
<lib_test/lwt/config/*.ml{,i,y}>: pkg_uint.uint32
<lib_test/lwt/config/*.ml{,i,y}>: pkg_uint.uint64
<lib_test/lwt/config/*.ml{,i,y}>: pkg_unix
<lib_test/lwt/config/*.ml{,i,y}>: use_release
<lib_test/lwt/config/*.ml{,i,y}>: use_release-lwt
# OASIS_STOP
<lib/option/*.ml>: annot
<lib/option/*.ml>: warn_error_A
Expand Down
2 changes: 1 addition & 1 deletion lib_test/config/config_test_async.ml → lib_test/async/config/config_test.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ open Printf
open Release_async
module C = Release.Config

let path = "./lib_test"
let path = "./lib_test/config"

let return_unit =
return ()
Expand Down
Loading

0 comments on commit b1fbd01

Please sign in to comment.