diff options
| author | Hans Bolinder <[email protected]> | 2013-03-19 09:45:02 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2013-03-19 09:45:02 +0100 |
| commit | ab15d1c6ea041f1d4a8b5897f9f4ca7c4c4d86d0 (patch) | |
| tree | ab2a7f0f5f64e13a4148e11bcd0b6772ad2668a5 /lib/stdlib/test/io_proto_SUITE.erl | |
| parent | 4ac5deb44293aa78ee53dae0e190733442a2c6c6 (diff) | |
| parent | 4aca384fb03e29b4494831041de515362ed1af77 (diff) | |
| download | otp-ab15d1c6ea041f1d4a8b5897f9f4ca7c4c4d86d0.tar.gz otp-ab15d1c6ea041f1d4a8b5897f9f4ca7c4c4d86d0.tar.bz2 otp-ab15d1c6ea041f1d4a8b5897f9f4ca7c4c4d86d0.zip | |
Merge branch 'hb/test_case_corrections' into maint
* hb/test_case_corrections:
Fix a test case
Fix a test case
Fix a test case bug
Fix a test case bug
Remove ?line from dets_SUITE.erl
Adjust dets.erl to cope with an evil test case
Correct a disk_log testcase
Diffstat (limited to 'lib/stdlib/test/io_proto_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/io_proto_SUITE.erl | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl index 4ca8680fc9..e16ba55481 100644 --- a/lib/stdlib/test/io_proto_SUITE.erl +++ b/lib/stdlib/test/io_proto_SUITE.erl @@ -935,8 +935,8 @@ bc_with_r12_gl_1(_Config,Machine) -> TestDataLine1BinUtf = unicode:characters_to_binary(TestDataLine1), TestDataLine1BinLatin = list_to_binary(TestDataLine1), - N2List = create_nodename(), - MyNodeList = atom_to_list(node()), + {ok,N2List} = create_nodename(), + MyNodeList = atom2list(node()), register(io_proto_suite,self()), AM1 = spawn(?MODULE,Machine, [MyNodeList, "io_proto_suite", N2List]), @@ -1182,8 +1182,8 @@ read_modes_gl_1(_Config,Machine) -> TestDataLine1BinUtf = unicode:characters_to_binary(TestDataLine1), TestDataLine1BinLatin = list_to_binary(TestDataLine1), - N2List = create_nodename(), - MyNodeList = atom_to_list(node()), + {ok,N2List} = create_nodename(), + MyNodeList = atom2list(node()), register(io_proto_suite,self()), AM1 = spawn(?MODULE,Machine, [MyNodeList, "io_proto_suite", N2List]), @@ -1609,7 +1609,7 @@ create_nodename(X) -> case file:read_file_info(filename:join(["/tmp",NN])) of {error,enoent} -> Host = lists:nth(2,string:tokens(atom_to_list(node()),"@")), - NN++"@"++Host; + {ok,NN++"@"++Host}; _ -> create_nodename(X+1) end. @@ -1925,6 +1925,9 @@ from(H, [H | T]) -> T; from(H, [_ | T]) -> from(H, T); from(_, []) -> []. +atom2list(A) -> + lists:flatten(io_lib:format("~w", [A])). + chomp([]) -> []; chomp([$\n]) -> |