ssl: Use include_lib in tests for whitebox testing

And remove the installation of src header files previously used, I do this to avoid installing src headers in tests which can mess up things during development and local testing. Also remove some logging.
erlang · Jan 15, 2025 · 4670b9a · 4670b9a
1 parent 02c007b
commit 4670b9a
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 41 deletions.
diff --git a/lib/ssl/test/Makefile b/lib/ssl/test/Makefile
@@ -113,22 +113,6 @@ HRL_FILES = \
 	ssl_test_lib.hrl\
 	ssl_dist_test_lib.hrl
 
-HRL_FILES_SRC = \
-	ssl_api.hrl\
-	ssl_internal.hrl\
-	ssl_alert.hrl \
-	tls_handshake.hrl \
-	ssl_handshake.hrl \
-	ssl_cipher.hrl \
-	tls_record.hrl \
-	ssl_record.hrl
-
-HRL_FILES_INC = 
-
-HRL_FILES_NEEDED_IN_TEST = \
-	$(HRL_FILES_SRC:%=../src/%) \
-	$(HRL_FILES_INC:%=../include/%)
-
 TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 INCLUDES = -I.
@@ -185,7 +169,7 @@ release_spec: opt
 
 release_tests_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(HRL_FILES_NEEDED_IN_TEST) $(COVER_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(COVER_FILE) "$(RELSYSDIR)"
 	$(INSTALL_DATA) ssl.spec ssl_bench.spec ssl_gh.spec ssl.cover "$(RELSYSDIR)"
 	chmod -R u+w "$(RELSYSDIR)"
 	@tar cf - *_SUITE_data property_test | (cd "$(RELSYSDIR)"; tar xf -)

diff --git a/lib/ssl/test/openssl_session_ticket_SUITE.erl b/lib/ssl/test/openssl_session_ticket_SUITE.erl
@@ -57,7 +57,7 @@
          openssl_client_early_data_basic/1]).
 
 -include("ssl_test_lib.hrl").
--include("tls_handshake.hrl").
+-include_lib("ssl/src/tls_handshake.hrl").
 
 -include_lib("common_test/include/ct.hrl").
 

diff --git a/lib/ssl/test/ssl_api_SUITE.erl b/lib/ssl/test/ssl_api_SUITE.erl
@@ -28,7 +28,7 @@
 -include_lib("ssl/src/ssl_api.hrl").
 -include_lib("ssl/src/ssl_internal.hrl").
 -include_lib("public_key/include/public_key.hrl").
--include("ssl_record.hrl").
+-include_lib("ssl/src/ssl_record.hrl").
 
 %% Common test
 -export([all/0,

diff --git a/lib/ssl/test/ssl_bench_test_lib.erl b/lib/ssl/test/ssl_bench_test_lib.erl
@@ -47,7 +47,7 @@ setup(Name) ->
             PeerOptions =
                 #{name => NameStr,
                   host => Host},
-            ?CT_LOG("PeerOptions: ~p~n", [PeerOptions]),
+            %% io:format("PeerOptions: ~p~n", [PeerOptions]),
             {ok, _Pid, Node} =
                 peer:start(
                   case Remote of
@@ -61,7 +61,7 @@ setup(Name) ->
             Path = code:get_path(),
             true = erpc:call(Node, code, set_path, [Path]),
             ok = erpc:call(Node, ?MODULE, setup_server, [node()]),
-            ?CT_LOG("Client (~p) using ~ts~n",[node(), code:which(ssl)]),
+            %% ?CT_LOG("Client (~p) using ~ts~n",[node(), code:which(ssl)]),
             (Node =:= node()) andalso restrict_schedulers(client),
             Node
     end.
@@ -74,7 +74,7 @@ find_executable(Prog) ->
 
 setup_server(ClientNode) ->
     (ClientNode =:= node()) andalso restrict_schedulers(server),
-    ?CT_PAL("Server (~p) using ~ts~n",[node(), code:which(ssl)]),
+    %% ?CT_PAL("Server (~p) using ~ts~n",[node(), code:which(ssl)]),
     ok.
 
 restrict_schedulers(Type) ->

diff --git a/lib/ssl/test/ssl_cert_SUITE.erl b/lib/ssl/test/ssl_cert_SUITE.erl
@@ -25,7 +25,7 @@
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("public_key/include/public_key.hrl").
--include("ssl_record.hrl").
+-include_lib("ssl/src/ssl_record.hrl").
 
 %% Common test
 -export([all/0,

diff --git a/lib/ssl/test/ssl_cipher_SUITE.erl b/lib/ssl/test/ssl_cipher_SUITE.erl
@@ -23,9 +23,9 @@
 -behaviour(ct_suite).
 
 -include_lib("common_test/include/ct.hrl").
--include("tls_record.hrl").
--include("ssl_cipher.hrl").
--include("ssl_record.hrl").
+-include_lib("ssl/src/tls_record.hrl").
+-include_lib("ssl/src/ssl_cipher.hrl").
+-include_lib("ssl/src/ssl_record.hrl").
 
 %% Callback functions
 -export([all/0,

diff --git a/lib/ssl/test/ssl_handshake_SUITE.erl b/lib/ssl/test/ssl_handshake_SUITE.erl
@@ -25,11 +25,11 @@
 -behaviour(ct_suite).
 
 -include_lib("common_test/include/ct.hrl").
--include("ssl_alert.hrl").
--include("ssl_handshake.hrl").
--include("ssl_internal.hrl").
--include("ssl_record.hrl").
--include("tls_handshake.hrl").
+-include_lib("ssl/src/ssl_alert.hrl").
+-include_lib("ssl/src/ssl_handshake.hrl").
+-include_lib("ssl/src/ssl_internal.hrl").
+-include_lib("ssl/src/ssl_record.hrl").
+-include_lib("ssl/src/tls_handshake.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
 %% Common test

diff --git a/lib/ssl/test/ssl_mfl_SUITE.erl b/lib/ssl/test/ssl_mfl_SUITE.erl
@@ -23,7 +23,7 @@
 
 -include("ssl_test_lib.hrl").
 -include_lib("common_test/include/ct.hrl").
--include("ssl_record.hrl").
+-include_lib("ssl/src/ssl_record.hrl").
 
 %% Common test
 -export([all/0,

diff --git a/lib/ssl/test/ssl_reject_SUITE.erl b/lib/ssl/test/ssl_reject_SUITE.erl
@@ -22,7 +22,7 @@
 -module(ssl_reject_SUITE).
 
 -include_lib("common_test/include/ct.hrl").
--include("ssl_record.hrl").
+-include_lib("ssl/src/ssl_record.hrl").
 -include_lib("ssl/src/ssl_alert.hrl").
 -include_lib("ssl/src/ssl_handshake.hrl").
 

diff --git a/lib/ssl/test/ssl_renegotiate_SUITE.erl b/lib/ssl/test/ssl_renegotiate_SUITE.erl
@@ -27,7 +27,7 @@
 -include("ssl_test_lib.hrl").
 -include_lib("common_test/include/ct.hrl").
 -include_lib("public_key/include/public_key.hrl").
--include("ssl_record.hrl").
+-include_lib("ssl/src/ssl_record.hrl").
 
 %% Common test
 -export([all/0,

diff --git a/lib/ssl/test/ssl_session_SUITE.erl b/lib/ssl/test/ssl_session_SUITE.erl
@@ -24,8 +24,8 @@
 -behaviour(ct_suite).
 
 -include("ssl_test_lib.hrl").
--include("tls_handshake.hrl").
--include("ssl_record.hrl").
+-include_lib("ssl/src/tls_handshake.hrl").
+-include_lib("ssl/src/ssl_record.hrl").
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("public_key/include/public_key.hrl").

diff --git a/lib/ssl/test/ssl_session_cache_api_SUITE.erl b/lib/ssl/test/ssl_session_cache_api_SUITE.erl
@@ -25,7 +25,7 @@
 -behaviour(ct_suite).
 
 -include_lib("common_test/include/ct.hrl").
--include("tls_handshake.hrl").
+-include_lib("ssl/src/tls_handshake.hrl").
 
 %% Callback functions
 -export([all/0,

diff --git a/lib/ssl/test/ssl_session_ticket_SUITE.erl b/lib/ssl/test/ssl_session_ticket_SUITE.erl
@@ -83,7 +83,7 @@
          stateless_multiple_servers/1]).
 
 -include("ssl_test_lib.hrl").
--include("tls_handshake.hrl").
+-include_lib("ssl/src/tls_handshake.hrl").
 -include_lib("common_test/include/ct.hrl").
 
 -define(SLEEP, 500).

diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
@@ -3532,8 +3532,8 @@ portable_open_port("openssl" = Exe, Args0) ->
     case IsWindows andalso os:getenv("WSLENV") of
         false ->
             AbsPath = os:find_executable(Exe),
-            ?CT_LOG("open_port({spawn_executable, ~p}, [stderr_to_stdout,~n {args, \"~s\"}]).",
-		 [AbsPath, lists:join($\s, Args0)]),
+            %% ?CT_LOG("open_port({spawn_executable, ~p}, [stderr_to_stdout,~n {args, \"~s\"}]).",
+	    %%      [AbsPath, lists:join($\s, Args0)]),
             open_port({spawn_executable, AbsPath},
                       [{args, Args0}, stderr_to_stdout]);
 	_ ->

diff --git a/lib/ssl/test/tls_server_session_ticket_SUITE.erl b/lib/ssl/test/tls_server_session_ticket_SUITE.erl
@@ -25,7 +25,7 @@
 -include_lib("ssl/src/ssl_cipher.hrl").
 -include_lib("ssl/src/ssl_internal.hrl").
 -include_lib("ssl/src/tls_handshake_1_3.hrl").
--include("ssl_record.hrl").
+-include_lib("ssl/src/ssl_record.hrl").
 
 %% Callback functions
 -export([all/0,