aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-01-23 15:57:03 +0100
committerRickard Green <[email protected]>2019-01-23 15:57:03 +0100
commita4641c5b3469d2e3cb9b0937ed941748fbbf2036 (patch)
tree66791aea3fda66e16a5041d1c6a37726e5880bba /lib/common_test
parenta8364425a7190b65cd33e58ac3c155a77c462b74 (diff)
parenteaeec753c035c2214be2930290a0a6de411566b0 (diff)
downloadotp-a4641c5b3469d2e3cb9b0937ed941748fbbf2036.tar.gz
otp-a4641c5b3469d2e3cb9b0937ed941748fbbf2036.tar.bz2
otp-a4641c5b3469d2e3cb9b0937ed941748fbbf2036.zip
Merge branch 'rickard/ei-ext/OTP-15442' into rickard/ei-ext-maint/OTP-15442
Diffstat (limited to 'lib/common_test')
-rw-r--r--lib/common_test/test_server/ts_erl_config.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/common_test/test_server/ts_erl_config.erl b/lib/common_test/test_server/ts_erl_config.erl
index 537628e39a..f3972bea4e 100644
--- a/lib/common_test/test_server/ts_erl_config.erl
+++ b/lib/common_test/test_server/ts_erl_config.erl
@@ -208,7 +208,11 @@ erl_interface(Vars,OsType) ->
{filename:join(Dir, "lib"),
filename:join([Dir, "src", "eidefs.mk"])};
{srctree, _Root, Target} ->
- {filename:join([Dir, "obj", Target]),
+ Obj = case is_debug_build() of
+ true -> "obj.debug";
+ false -> "obj"
+ end,
+ {filename:join([Dir, Obj, Target]),
filename:join([Dir, "src", Target, "eidefs.mk"])}
end}
end,