diff options
| author | Peter Andersson <[email protected]> | 2012-08-23 15:50:28 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-08-23 15:50:46 +0200 |
| commit | d961f2d397584e2fa8c6da4b2d6fa495803a7065 (patch) | |
| tree | 0112e99ae2b35cd6caa25f56188522601231856b /lib/common_test/src/ct_util.hrl | |
| parent | 69c3f5994342bd60ee43402b6c91f87b58f89b8b (diff) | |
| parent | e654efdc00b7ed658de589faab6df0f67b2b62e7 (diff) | |
| download | otp-d961f2d397584e2fa8c6da4b2d6fa495803a7065.tar.gz otp-d961f2d397584e2fa8c6da4b2d6fa495803a7065.tar.bz2 otp-d961f2d397584e2fa8c6da4b2d6fa495803a7065.zip | |
Merge branch 'peppe/common_test/table_sorter' into maint
* peppe/common_test/table_sorter:
Fix installation of javascript files on windows
Fix installation of javascript files
Make it possible to sort the HTML tables
Conflicts:
lib/common_test/src/ct_util.hrl
OTP-9896
Diffstat (limited to 'lib/common_test/src/ct_util.hrl')
| -rw-r--r-- | lib/common_test/src/ct_util.hrl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/common_test/src/ct_util.hrl b/lib/common_test/src/ct_util.hrl index 474d36574e..31341c7b55 100644 --- a/lib/common_test/src/ct_util.hrl +++ b/lib/common_test/src/ct_util.hrl @@ -65,5 +65,10 @@ -define(ct_profile_file, ".common_test"). +-define(css_default, "ct_default.css"). +-define(sortable_table_name, "SortableTable"). +-define(jquery_script, "jquery-latest.js"). +-define(tablesorter_script, "jquery.tablesorter.min.js"). + %% Logging information for error handler -record(conn_log, {client, name, address, action, module}). |