diff options
| author | Henrik Nord <[email protected]> | 2011-05-09 15:08:38 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-05-09 15:08:46 +0200 |
| commit | b20244d0f730a950749919245eec3abd42b44cc5 (patch) | |
| tree | ad2e420e7b32498dadccf115ac6ecc76dd5bf535 /lib/dialyzer/test/dialyzer_common.erl | |
| parent | dbc55f6b24ed507ee2201d0c084d167630d822d0 (diff) | |
| parent | 39e62c0a199af0c91d1bfb11b186b574824dce1b (diff) | |
| download | otp-b20244d0f730a950749919245eec3abd42b44cc5.tar.gz otp-b20244d0f730a950749919245eec3abd42b44cc5.tar.bz2 otp-b20244d0f730a950749919245eec3abd42b44cc5.zip | |
Merge branch 'sa/dialyzer-tests' into dev
* sa/dialyzer-tests: (22 commits)
Update dialyzer.spec
Add race/ets_insert_public
Add opaque/ewgi,ewgi2
Add opaque/schuett_bug
Add small/param_types_crash
Add small/file_open_encoding
Add small/false_false
Add small/ets_update_counter
Add small/bin_compr
Add small/tuple_set_crash
Add small/refine_failing
Add small/not_bogus_warning
Add small/none_scc_inf_loop
Add small/guards
Add small/guard_warnings
Add small/confusing_record_warning
Add small/blame_contract_range
Update small/recursive_types2 source
Update opaque/zoltan_kis* sources
Update options1/compiler results
...
OTP-9278
Diffstat (limited to 'lib/dialyzer/test/dialyzer_common.erl')
| -rw-r--r-- | lib/dialyzer/test/dialyzer_common.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/dialyzer/test/dialyzer_common.erl b/lib/dialyzer/test/dialyzer_common.erl index 5577405483..51766a4604 100644 --- a/lib/dialyzer/test/dialyzer_common.erl +++ b/lib/dialyzer/test/dialyzer_common.erl @@ -7,13 +7,13 @@ -module(dialyzer_common). --export([check_plt/1, check/4, create_suite/1, - create_all_suites/0, new_tests/2]). +-export([check_plt/1, check/4, create_all_suites/0, new_tests/2]). -include_lib("kernel/include/file.hrl"). --define(suite_suffix, "_tests_SUITE"). +-define(suite_suffix, "_SUITE"). -define(data_folder, "_data"). +-define(suite_data, ?suite_suffix ++ ?data_folder). -define(erlang_extension, ".erl"). -define(output_file_mode, write). -define(dialyzer_option_file, "dialyzer_options"). @@ -209,7 +209,7 @@ get_suites(Dir) -> {error, _} -> []; {ok, Filenames} -> FullFilenames = [filename:join(Dir, F) || F <-Filenames ], - Dirs = [suffix(filename:basename(F), "_tests_SUITE_data") || + Dirs = [suffix(filename:basename(F), ?suite_data) || F <- FullFilenames, file_utils:file_type(F) =:= {ok, 'directory'}], [S || {yes, S} <- Dirs] @@ -232,7 +232,7 @@ create_suite(SuiteName) -> generate_suite(SuiteName, OutputFile, OptionsFileN, InputDirN). generate_suite_dir_from_name(Cwd, SuiteName) -> - filename:join(Cwd, SuiteName ++ ?suite_suffix ++ ?data_folder). + filename:join(Cwd, SuiteName ++ ?suite_data). generate_suite_file(Cwd, SuiteName) -> OutputFilename = @@ -305,7 +305,7 @@ write_header(#suite{suitename = SuiteName, outputfile = OutputFile, "%% All Dialyzer options should be defined in dialyzer_options\n" "%% file.\n\n" "-module(~s).\n\n" - "-include(\"ct.hrl\").\n" + "-include_lib(\"common_test/include/ct.hrl\").\n" "-include(\"dialyzer_test_constants.hrl\").\n\n" "-export([suite/0, init_per_suite/0, init_per_suite/1,\n" " end_per_suite/1, all/0]).\n" |