aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2015-09-30 11:22:14 +0200
committerSiri Hansen <[email protected]>2015-09-30 11:22:14 +0200
commitba2528b482e48f2e45509f6999f8f919b152d48f (patch)
tree33aac21cd544bda53551549b6796b3542858810b
parent19d69f756a6742b35eecf614760078aa2ee69925 (diff)
parent543231f01e46df527ad2a7ad74942836a05b5a00 (diff)
downloadotp-ba2528b482e48f2e45509f6999f8f919b152d48f.tar.gz
otp-ba2528b482e48f2e45509f6999f8f919b152d48f.tar.bz2
otp-ba2528b482e48f2e45509f6999f8f919b152d48f.zip
Merge branch 'siri/ts_lib-get_arg/remove_space/OTP-13015' into maint
* siri/ts_lib-get_arg/remove_space/OTP-13015: Allow internal spaces in IFEQ test in generated Makefile
-rw-r--r--lib/test_server/src/ts_lib.erl4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/test_server/src/ts_lib.erl b/lib/test_server/src/ts_lib.erl
index 61bd55a654..7c3f450194 100644
--- a/lib/test_server/src/ts_lib.erl
+++ b/lib/test_server/src/ts_lib.erl
@@ -250,12 +250,10 @@ do_test(Rest, Vars, Test) ->
{Result,Comment,Rest2}.
%% extract an argument
-get_arg([$ |Rest], Vars, Stop, Acc) ->
- get_arg(Rest, Vars, Stop, Acc);
get_arg([$(|Rest], Vars, Stop, _) ->
get_arg(Rest, Vars, Stop, []);
get_arg([Stop|Rest], Vars, Stop, Acc) ->
- Arg = lists:reverse(Acc),
+ Arg = string:strip(lists:reverse(Acc)),
Subst = subst(Arg, Vars),
{Subst,Rest};
get_arg([C|Rest], Vars, Stop, Acc) ->