diff options
| author | Lukas Larsson <[email protected]> | 2012-07-19 16:32:52 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-07-19 16:32:52 +0200 |
| commit | 3bac8dc5b0fc19613798c393235c469edf968a46 (patch) | |
| tree | 16bbef77bbdf311bc96cfece3621dcbfc74ef31a /erts/emulator/test | |
| parent | ed273fd511169dba3686f97c7276a6508973400b (diff) | |
| parent | 4a80ad242cc2d8f96142dec06d2006b019adc98f (diff) | |
| download | otp-3bac8dc5b0fc19613798c393235c469edf968a46.tar.gz otp-3bac8dc5b0fc19613798c393235c469edf968a46.tar.bz2 otp-3bac8dc5b0fc19613798c393235c469edf968a46.zip | |
Merge branch 'lukas/benchmarks/OTP-10156'
* lukas/benchmarks/OTP-10156:
Add mnesia tpc benchmark
Add estone benchmarks to ts benchmark framework
Add framework to ts to run benchmarks
Diffstat (limited to 'erts/emulator/test')
| -rw-r--r-- | erts/emulator/test/Makefile | 5 | ||||
| -rw-r--r-- | erts/emulator/test/emulator_bench.spec | 1 | ||||
| -rw-r--r-- | erts/emulator/test/estone_SUITE.erl | 16 |
3 files changed, 16 insertions, 6 deletions
diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile index 627aa01bbf..506df251e8 100644 --- a/erts/emulator/test/Makefile +++ b/erts/emulator/test/Makefile @@ -138,10 +138,7 @@ TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) EMAKEFILE=Emakefile -TEST_SPEC_FILES = emulator.spec \ - emulator.spec.win \ - emulator.spec.vxworks \ - emulator.spec.ose +TEST_SPEC_FILES = emulator.spec emulator_bench.spec # ---------------------------------------------------- # Release directory specification # ---------------------------------------------------- diff --git a/erts/emulator/test/emulator_bench.spec b/erts/emulator/test/emulator_bench.spec new file mode 100644 index 0000000000..f709d913b7 --- /dev/null +++ b/erts/emulator/test/emulator_bench.spec @@ -0,0 +1 @@ +{groups,"../emulator_test",estone_SUITE,[estone_bench]}. diff --git a/erts/emulator/test/estone_SUITE.erl b/erts/emulator/test/estone_SUITE.erl index 2417d4bcfe..21834bfa62 100644 --- a/erts/emulator/test/estone_SUITE.erl +++ b/erts/emulator/test/estone_SUITE.erl @@ -19,7 +19,7 @@ -module(estone_SUITE). %% Test functions -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, - init_per_group/2,end_per_group/2,estone/1]). + init_per_group/2,end_per_group/2,estone/1,estone_bench/1]). -export([init_per_testcase/2, end_per_testcase/2]). %% Internal exports for EStone tests @@ -46,6 +46,7 @@ -include_lib("test_server/include/test_server.hrl"). +-include_lib("common_test/include/ct_event.hrl"). %% Test suite defines -define(default_timeout, ?t:minutes(10)). @@ -80,7 +81,7 @@ all() -> [estone]. groups() -> - []. + [{estone_bench, [{repeat,50}],[estone_bench]}]. init_per_suite(Config) -> Config. @@ -108,6 +109,17 @@ estone(Config) when is_list(Config) -> ?line {comment,Mhz ++ " MHz, " ++ integer_to_list(Stones) ++ " ESTONES"}. +estone_bench(Config) -> + DataDir = ?config(data_dir,Config), + L = ?MODULE:macro(?MODULE:micros(),DataDir), + [ct_event:notify( + #event{name = benchmark_data, + data = [{name,proplists:get_value(title,Mark)}, + {value,proplists:get_value(estones,Mark)}]}) + || Mark <- L], + L. + + %% %% Calculate CPU speed %% |