Skip to content

Commit c8b85b1

Browse files
authored
Merge pull request #1012 from bloomberg/more_data_structure_unitests
extensive unitests for data structures
2 parents 534547d + f40bad2 commit c8b85b1

21 files changed

+11564
-950
lines changed

jscomp/Makefile

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,15 @@ common/bs_version.ml: build_version.js ../package.json
112112
STUB_SRCS = bs_hash_stubs
113113
OUNIT_SRCS = oUnit oUnitDiff oUnitLogger oUnitTypes oUnitUtils oUnitChooser
114114
OUNIT_CMXS = $(addprefix ounit/, $(addsuffix .cmx, $(OUNIT_SRCS)))
115-
OUNIT_TESTS_SRCS = ounit_tests_util ounit_array_tests ounit_list_test ounit_bal_tree_tests ounit_path_tests ounit_union_find_tests ounit_hash_stubs_test ounit_hash_set_tests ounit_scc_tests ounit_json_tests ounit_map_tests ounit_vec_test ounit_tests_main
115+
OUNIT_TESTS_SRCS = ounit_tests_util \
116+
ounit_array_tests ounit_list_test \
117+
ounit_bal_tree_tests ounit_path_tests \
118+
ounit_union_find_tests ounit_hash_stubs_test \
119+
ounit_hash_set_tests ounit_scc_tests \
120+
ounit_json_tests ounit_map_tests \
121+
ounit_ordered_hash_set_tests \
122+
ounit_vec_test \
123+
ounit_tests_main
116124
OUNIT_TESTS_CMXS = $(addprefix ounit_tests/, $(addsuffix .cmx, $(OUNIT_TESTS_SRCS)))
117125

118126
EXT_SRCS = ext_util\
@@ -137,6 +145,7 @@ EXT_SRCS = ext_util\
137145
hash_set_gen hash_set string_hash_set int_hash_set \
138146
ordered_hash_set_gen\
139147
ordered_hash_set_string\
148+
ordered_hash_set_make\
140149
ordered_hash_map_gen\
141150
union_find \
142151
ext_ident\
@@ -333,11 +342,14 @@ bin/all_ounit_tests.ml:./bin/bspack.exe
333342
$< -bs-MD -I ounit -I ounit_tests -I stubs -I bsb -I common -I ext -I syntax -I depends -I bspp -I core -bs-main Ounit_tests_main -o $@
334343
-include bin/all_ounit_tests.d
335344

345+
346+
336347
bin/all_ounit_tests.exe: stubs/ext_basic_hash_stubs.c bin/all_ounit_tests.mli bin/all_ounit_tests.ml
337-
$(NATIVE) -g -I bin -w -a unix.cmxa $^ -o $@
348+
ocamloptp -g -I bin -w -a unix.cmxa $^ -o $@
338349

339350
test:bin/all_ounit_tests.exe
340-
$^
351+
$^ && ocamlprof bin/all_ounit_tests.ml > bin/all_ounit_tests.i.ml && rm ocamlprof.dump
352+
341353

342354
# bin/all_ounit_tests.i.exe: stubs/ext_basic_hash_stubs.c bin/all_ounit_tests.mli bin/all_ounit_tests.ml
343355
# $(NATIVE) -ppx /Users/hzhang295/.opam/4.02.3+local-git-master/lib/bisect_ppx/bisect_ppx -g -I bin -w -a unix.cmxa $^ -o $@

jscomp/all.depend

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ ext/int_hash_set.cmx : ext/hash_set_gen.cmx ext/ext_int.cmx \
3636
stubs/bs_hash_stubs.cmx ext/int_hash_set.cmi
3737
ext/ordered_hash_set_gen.cmx : ext/ext_util.cmx
3838
ext/ordered_hash_set_string.cmx : ext/ordered_hash_set_gen.cmx \
39-
ext/ext_string.cmx stubs/bs_hash_stubs.cmx
39+
ext/ext_string.cmx stubs/bs_hash_stubs.cmx \
40+
ext/ordered_hash_set_string.cmi
41+
ext/ordered_hash_set_make.cmx : ext/ordered_hash_set_gen.cmx
4042
ext/ordered_hash_map_gen.cmx : ext/ext_util.cmx
4143
ext/union_find.cmx : ext/union_find.cmi
4244
ext/ext_ident.cmx : ext/string_hashtbl.cmx ext/string_hash_set.cmx \
@@ -91,6 +93,7 @@ ext/ext_sys.cmi :
9193
ext/hash_set.cmi : ext/hash_set_gen.cmx
9294
ext/string_hash_set.cmi : ext/hash_set_gen.cmx
9395
ext/int_hash_set.cmi : ext/hash_set_gen.cmx
96+
ext/ordered_hash_set_string.cmi : ext/ordered_hash_set_gen.cmx
9497
ext/union_find.cmi :
9598
ext/ext_ident.cmi :
9699
ext/ident_map.cmi : ext/map_gen.cmx
@@ -555,11 +558,14 @@ ounit_tests/ounit_scc_tests.cmx : ounit/oUnit.cmx ext/int_vec_vec.cmx \
555558
ounit_tests/ounit_json_tests.cmx : ext/string_map.cmx ounit/oUnit.cmx \
556559
bsb/bsb_json.cmx
557560
ounit_tests/ounit_map_tests.cmx : ounit/oUnit.cmx ext/int_map.cmx
561+
ounit_tests/ounit_ordered_hash_set_tests.cmx : \
562+
ext/ordered_hash_set_string.cmx ounit/oUnit.cmx ext/ext_util.cmx
558563
ounit_tests/ounit_vec_test.cmx : ounit/oUnit.cmx ext/int_vec.cmx \
559564
bsb/bsb_json.cmx
560565
ounit_tests/ounit_tests_main.cmx : ext/resize_array.cmx \
561566
ounit_tests/ounit_vec_test.cmx ounit_tests/ounit_union_find_tests.cmx \
562567
ounit_tests/ounit_scc_tests.cmx ounit_tests/ounit_path_tests.cmx \
568+
ounit_tests/ounit_ordered_hash_set_tests.cmx \
563569
ounit_tests/ounit_map_tests.cmx ounit_tests/ounit_list_test.cmx \
564570
ounit_tests/ounit_json_tests.cmx ounit_tests/ounit_hash_stubs_test.cmx \
565571
ounit_tests/ounit_hash_set_tests.cmx ounit_tests/ounit_bal_tree_tests.cmx \

jscomp/bin/all_ounit_tests.d

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ bin/all_ounit_tests.ml : ext/hash_set_poly.mli
2929
bin/all_ounit_tests.ml : stubs/bs_hash_stubs.ml
3030
bin/all_ounit_tests.ml : ext/ordered_hash_set_gen.ml
3131
bin/all_ounit_tests.ml : ext/ordered_hash_set_string.ml
32+
bin/all_ounit_tests.ml : ext/ordered_hash_set_string.mli
3233
bin/all_ounit_tests.ml : ext/string_hash_set.ml
3334
bin/all_ounit_tests.ml : ext/string_hash_set.mli
3435
bin/all_ounit_tests.ml : ounit_tests/ounit_hash_set_tests.ml
@@ -47,6 +48,7 @@ bin/all_ounit_tests.ml : ounit_tests/ounit_list_test.ml
4748
bin/all_ounit_tests.ml : ext/int_map.ml
4849
bin/all_ounit_tests.ml : ext/int_map.mli
4950
bin/all_ounit_tests.ml : ounit_tests/ounit_map_tests.ml
51+
bin/all_ounit_tests.ml : ounit_tests/ounit_ordered_hash_set_tests.ml
5052
bin/all_ounit_tests.ml : ext/ext_pervasives.ml
5153
bin/all_ounit_tests.ml : ext/ext_pervasives.mli
5254
bin/all_ounit_tests.ml : ext/literals.ml

0 commit comments

Comments
 (0)