diff options
author | Lukas Larsson <[email protected]> | 2010-11-22 15:35:06 +0100 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2010-11-22 15:35:06 +0100 |
commit | 0d7914029a6b111323cc3c739486bb943cf0bf5e (patch) | |
tree | 815bf28ff17ca54010bdf2d52ad1e7678506d128 /lib/common_test/test/ct_master_SUITE_data/master | |
parent | 717ddda3afd53d9564cf0d7b7544b66146cea5a2 (diff) | |
parent | 410ffad2ce9200158cd6bd5657e465cb1351673e (diff) | |
download | otp-0d7914029a6b111323cc3c739486bb943cf0bf5e.tar.gz otp-0d7914029a6b111323cc3c739486bb943cf0bf5e.tar.bz2 otp-0d7914029a6b111323cc3c739486bb943cf0bf5e.zip |
Merge branch 'lukas/common_test/master_include/OTP-8935' into dev
* lukas/common_test/master_include/OTP-8935:
Update master test to put slave logs in /tmp for windows as otherwise filenames become too long and the tests fail
Update master test specs to work with include directives
Diffstat (limited to 'lib/common_test/test/ct_master_SUITE_data/master')
-rw-r--r-- | lib/common_test/test/ct_master_SUITE_data/master/include/test.hrl | 0 | ||||
-rw-r--r-- | lib/common_test/test/ct_master_SUITE_data/master/master_SUITE.erl | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/lib/common_test/test/ct_master_SUITE_data/master/include/test.hrl b/lib/common_test/test/ct_master_SUITE_data/master/include/test.hrl new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/lib/common_test/test/ct_master_SUITE_data/master/include/test.hrl diff --git a/lib/common_test/test/ct_master_SUITE_data/master/master_SUITE.erl b/lib/common_test/test/ct_master_SUITE_data/master/master_SUITE.erl index e37ec3659c..032d69ad9f 100644 --- a/lib/common_test/test/ct_master_SUITE_data/master/master_SUITE.erl +++ b/lib/common_test/test/ct_master_SUITE_data/master/master_SUITE.erl @@ -28,6 +28,7 @@ -compile(export_all). -include_lib("common_test/include/ct.hrl"). +-include("test.hrl"). suite() -> []. |