aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src/ct_config.erl
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2013-01-27 02:17:16 +0100
committerPeter Andersson <[email protected]>2013-01-27 02:20:36 +0100
commit57abbf21ff6ce0a97182f848177338c1e2bceab2 (patch)
tree00ed4b96a171a3a080077610a4ca5eabe74bd6c5 /lib/common_test/src/ct_config.erl
parent936e5d23bc65a5ee8f2119dd1940b7edf20aca6c (diff)
parentc88b50bdf301b5ce17ce8f4f0d50d838e94292c6 (diff)
downloadotp-57abbf21ff6ce0a97182f848177338c1e2bceab2.tar.gz
otp-57abbf21ff6ce0a97182f848177338c1e2bceab2.tar.bz2
otp-57abbf21ff6ce0a97182f848177338c1e2bceab2.zip
Merge branch 'peppe/common_test/testspec_include'
* peppe/common_test/testspec_include: Add more tests Update documentation Add tests and correct errors Update CT Master Implement support for including test specifications Make it possible to execute one test run per test specification Conflicts: lib/common_test/src/ct_master.erl lib/common_test/src/ct_run.erl lib/common_test/src/ct_testspec.erl OTP-9881
Diffstat (limited to 'lib/common_test/src/ct_config.erl')
-rw-r--r--lib/common_test/src/ct_config.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl
index ee5f868689..c35cbd3c08 100644
--- a/lib/common_test/src/ct_config.erl
+++ b/lib/common_test/src/ct_config.erl
@@ -266,7 +266,10 @@ read_config_files_int([{Callback, File}|Files], FunToSave) ->
read_config_files_int([], _FunToSave) ->
ok.
-store_config(Config, Callback, File) ->
+store_config(Config, Callback, File) when is_tuple(Config) ->
+ store_config([Config], Callback, File);
+
+store_config(Config, Callback, File) when is_list(Config) ->
[ets:insert(?attr_table,
#ct_conf{key=Key,
value=Val,