File 1146-erts-Rename-and-refactor-perf-test-suite-t... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1146-erts-Rename-and-refactor-perf-test-suite-to-handle-J.patch of Package erlang (Revision de16d5bb9b1e73f72aa79d2ecdf361ff)

Currently displaying revision de16d5bb9b1e73f72aa79d2ecdf361ff , Show latest

From d617a365be1249cc4e07611e566d00a44f4faccd Mon Sep 17 00:00:00 2001
From: Frej Drejhammar <frej.drejhammar@gmail.com>
Date: Mon, 21 Jun 2021 10:49:48 +0200
Subject: [PATCH 6/7] erts: Rename and refactor perf test suite to handle JIT
 tests

Rename perf_SUITE to jit_SUITE and move the perf tests into a group
within it. Also make sure the suite is only run on a JIT emulator.
---
 erts/emulator/test/Makefile                   |  2 +-
 .../test/{perf_SUITE.erl => jit_SUITE.erl}    | 32 +++++++++++++++----
 2 files changed, 27 insertions(+), 7 deletions(-)
 rename erts/emulator/test/{perf_SUITE.erl => jit_SUITE.erl} (90%)

diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile
index 34a73a6f1d..239d02874a 100644
--- a/erts/emulator/test/Makefile
+++ b/erts/emulator/test/Makefile
@@ -76,6 +76,7 @@ MODULES= \
 	hello_SUITE \
 	hibernate_SUITE \
 	iovec_SUITE \
+	jit_SUITE \
 	list_bif_SUITE \
 	lttng_SUITE \
 	lcnt_SUITE \
@@ -92,7 +93,6 @@ MODULES= \
 	message_queue_data_SUITE \
 	op_SUITE \
 	os_signal_SUITE \
-	perf_SUITE \
 	port_SUITE \
 	port_bif_SUITE \
 	prim_eval_SUITE \
diff --git a/erts/emulator/test/perf_SUITE.erl b/erts/emulator/test/jit_SUITE.erl
similarity index 90%
rename from erts/emulator/test/perf_SUITE.erl
rename to erts/emulator/test/jit_SUITE.erl
index aaef7b039c..d67eab0e7d 100644
--- a/erts/emulator/test/perf_SUITE.erl
+++ b/erts/emulator/test/jit_SUITE.erl
@@ -18,20 +18,35 @@
 %% %CopyrightEnd%
 %%
 
--module(perf_SUITE).
+-module(jit_SUITE).
 
--export([all/0, suite/0, init_per_suite/1, end_per_suite/1]).
+-export([suite/0, groups/0, all/0,
+         init_per_suite/1, end_per_suite/1,
+         init_per_group/2, end_per_group/2]).
 -export([symbols/1, annotate/1]).
 
 suite() ->
     [{timetrap, {minutes, 4}}].
 
-all() -> 
-    [symbols, annotate].
+groups() ->
+    [{perf, [symbols, annotate]}].
+
+all() ->
+    [{group, perf}].
 
 init_per_suite(Config) ->
-    case erlang:system_info(emu_flavor) =:= jit andalso
-        os:find_executable("perf") =/= false of
+    case erlang:system_info(emu_flavor) of
+        jit ->
+            Config;
+        _ ->
+            {skip, "No point in running JIT tests on non-JIT emulator"}
+    end.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(perf, Config) ->
+    case os:find_executable("perf") of
         false ->
             {skip, "perf not found"};
         _Perf ->
@@ -65,9 +80,11 @@ init_per_suite(Config) ->
                 _ ->
                     {skip,"unknown old perf version: " ++ PerfVsn}
             end
-    end.
+    end;
+init_per_group(_, Config) ->
+    Config.
 
-end_per_suite(Config) ->
+end_per_group(perf, Config) ->
     %% perf inject writes data to /tmp and ~/.debug/tmp so we need to clean
     %% that up after the tests are done.
     SoToDelete = get_tmp_so_files() -- proplists:get_value(sobefore, Config),
@@ -80,6 +97,8 @@ end_per_suite(Config) ->
                       ok
               end
       end, SoToDelete),
+    ok;
+end_per_group(_, _Config) ->
     ok.
 
 get_tmp_so_files() ->
-- 
2.26.2

Places

File 1146-erts-Rename-and-refactor-perf-test-suite-to-handle-J.patch of Package erlang (Revision de16d5bb9b1e73f72aa79d2ecdf361ff)

Places