Fix .travis.yml for current known Linux failure

And revert branches and notification change.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40360 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 14 insertions, 14 deletions

diff --git a/.travis.yml b/.travis.yml
index 182cca291f..4b55e59ad6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,24 +44,24 @@ before_script:
   - "make -sj exts"
 script:
   - "make test OPTS=-v"
-  - "make test-all TESTS=-v"
+  - "make test-all TESTS='-v -n\"/^(?!test_make_socket_ipv6_multicast)/\"'"
 
 # Branch matrix.  Not all branches are Travis-ready so we limit branches here.
-# branches:
-#   only:
-#     - trunk
-#     - ruby_1_9_3
+branches:
+  only:
+    - trunk
+    - ruby_1_9_3
 
 # We want to be notified when something happens.
-# notifications:
-#   irc:
-#     channels:
-#       - "irc.freenode.org#ruby-core"
-#       - "irc.freenode.org#ruby-ja"
-#     on_success: change # [always|never|change] # default: always
-#     on_failure: change # [always|never|change] # default: always
-#     template:
-#       - "%{message} by @%{author}: See %{build_url}"
+notifications:
+  irc:
+    channels:
+      - "irc.freenode.org#ruby-core"
+      - "irc.freenode.org#ruby-ja"
+    on_success: change # [always|never|change] # default: always
+    on_failure: change # [always|never|change] # default: always
+    template:
+      - "%{message} by @%{author}: See %{build_url}"
 
 # Local Variables:
 # mode: YAML