aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2012-03-21 11:01:54 +0100
committerPatrik Nyblom <[email protected]>2012-03-21 11:01:54 +0100
commit63b7b9fe381843755a112e69d75205cf14d75baf (patch)
tree06f90f54cd491b052bf09e207f999bc3cbad8bd7 /lib/kernel
parent66b09026bfbb1385e17d4cd60c543858e5b5b98e (diff)
parentf65b43b80884ec86db328bdcc06109536116e211 (diff)
downloadotp-63b7b9fe381843755a112e69d75205cf14d75baf.tar.gz
otp-63b7b9fe381843755a112e69d75205cf14d75baf.tar.bz2
otp-63b7b9fe381843755a112e69d75205cf14d75baf.zip
Merge branch 'maint'
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;