diff options
| author | Erlang/OTP <[email protected]> | 2017-11-15 14:40:00 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-11-15 14:40:00 +0100 |
| commit | 5e3a6a639e22b4e5b0b0b0c4d4407e4c553c377b (patch) | |
| tree | d31ae4a84d9654df1abbe3e44a6cbbf676f3a0a6 /lib/jinterface/test | |
| parent | 24e0ec632a12f8f5ef2afc7cfc2118b7db6c1df9 (diff) | |
| parent | 599107f1dcc6533c094301ad21919c7c697b9a1b (diff) | |
| download | otp-5e3a6a639e22b4e5b0b0b0c4d4407e4c553c377b.tar.gz otp-5e3a6a639e22b4e5b0b0b0c4d4407e4c553c377b.tar.bz2 otp-5e3a6a639e22b4e5b0b0b0c4d4407e4c553c377b.zip | |
Merge branch 'hans/fix_build_env/OTP-14765' into maint-18
* hans/fix_build_env/OTP-14765:
Remove unused test include file from test suites
eldap: Repair Makefile
Diffstat (limited to 'lib/jinterface/test')
| -rw-r--r-- | lib/jinterface/test/jinterface_SUITE.erl | 1 | ||||
| -rw-r--r-- | lib/jinterface/test/nc_SUITE.erl | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/lib/jinterface/test/jinterface_SUITE.erl b/lib/jinterface/test/jinterface_SUITE.erl index 6d34a21209..5c4618dcde 100644 --- a/lib/jinterface/test/jinterface_SUITE.erl +++ b/lib/jinterface/test/jinterface_SUITE.erl @@ -46,7 +46,6 @@ ]). -include_lib("common_test/include/ct.hrl"). --include("test_server_line.hrl"). -define(debug,true). -ifdef(debug). diff --git a/lib/jinterface/test/nc_SUITE.erl b/lib/jinterface/test/nc_SUITE.erl index c5f3198c21..9910334749 100644 --- a/lib/jinterface/test/nc_SUITE.erl +++ b/lib/jinterface/test/nc_SUITE.erl @@ -21,7 +21,6 @@ -include_lib("common_test/include/ct.hrl"). --include("test_server_line.hrl"). -define(VERSION_MAGIC, 131). |