aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2012-03-21 10:58:20 +0100
committerPatrik Nyblom <[email protected]>2012-03-21 10:58:27 +0100
commitf65b43b80884ec86db328bdcc06109536116e211 (patch)
tree3d2ece75987020e673ca8e2c5a13a30e2c47ea38 /lib/kernel
parentadcbf2fa3f30619aedc6809924e185728aceb34d (diff)
parentb977401e3ef816d240980341996b355879524c16 (diff)
downloadotp-f65b43b80884ec86db328bdcc06109536116e211.tar.gz
otp-f65b43b80884ec86db328bdcc06109536116e211.tar.bz2
otp-f65b43b80884ec86db328bdcc06109536116e211.zip
Merge branch 'pan/testcase-fix-bigboot' into maint
* pan/testcase-fix-bigboot: Align java test Makefile.src with c tests ditto in ic Teach ei testsuites parallel make Teach edlin_expand_SUITE:init_per_suite independence Teach big_boot_embedded testcase about comte OTP-10008
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/test/code_SUITE.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 99b0cd2ffb..4dfa92a755 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -1441,6 +1441,9 @@ filter_app("netconf",_) ->
% Safe has the same kind of error in the .app file as ic
filter_app("safe",_) ->
false;
+% Comte cannot be started in the "usual" way
+filter_app("comte",_) ->
+ false;
% OS_mon does not find it's port program when running cerl
filter_app("os_mon",true) ->
false;