diff options
| author | Björn Gustavsson <bjorn@erlang.org> | 2011-10-27 12:27:33 +0200 |
|---|---|---|
| committer | Björn Gustavsson <bjorn@erlang.org> | 2011-10-27 12:27:33 +0200 |
| commit | a971c9568ccebed4e8d00abf52faa59a2bcc1c18 (patch) | |
| tree | 1a39c38bce2e27954ea772e80224069b41e5bcd9 /lib/xmerl | |
| parent | 86e4b23fb4a11f18834e6b1be76642fbd71b9cf7 (diff) | |
| parent | 3e8720728abe875683ad54fa4d93ba83df609f57 (diff) | |
| download | erlang-a971c9568ccebed4e8d00abf52faa59a2bcc1c18.tar.gz | |
Merge branch 'bjorn/eliminate-regexp-usage'
* bjorn/eliminate-regexp-usage:
erl_tidy: Eliminate two references to 'regexp' in the documentation
erts/z_SUITE: Eliminate use of deprecated regexp module
erts/nt_SUITE: Eliminate use of deprecated regexp module
erl_html_tools: Eliminate mention of deprecated regexp module
erl_interface tests: Eliminate use of deprecated regexp module
tools test suite: Eliminate compilation warnings for the eed module
tools test suite: Eliminate use of deprecated regexp module
xmerl test suite: Eliminate use of deprecated regexp module
appmon: Eliminate use of deprecated regexp module
tv: Eliminate use of deprecated regexp module
gs: Eliminate use of deprecated regexp module
inviso: Eliminate use of deprecated regexp module
Diffstat (limited to 'lib/xmerl')
| -rw-r--r-- | lib/xmerl/test/xmerl_test_lib.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/xmerl/test/xmerl_test_lib.erl b/lib/xmerl/test/xmerl_test_lib.erl index a83956c076..e82ad283b2 100644 --- a/lib/xmerl/test/xmerl_test_lib.erl +++ b/lib/xmerl/test/xmerl_test_lib.erl @@ -87,6 +87,6 @@ keysearch_delete(Key,N,List) -> %% the original data directory. get_data_dir(Config) -> - Data0 = ?config(data_dir, Config), - {ok,Data,_} = regexp:sub(Data0, "xmerl_sax_std_SUITE", "xmerl_std_SUITE"), - Data. + Data = ?config(data_dir, Config), + Opts = [{return,list}], + re:replace(Data, "xmerl_sax_std_SUITE", "xmerl_std_SUITE", Opts). |