summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Mitz <mitza@ociweb.com>2015-03-06 12:35:09 -0600
committerAdam Mitz <mitza@ociweb.com>2015-03-06 12:35:09 -0600
commitac6579d1373aef165e76bcec9f471eca058c3f3f (patch)
tree6246d97e60f35dc66e9a577428c2c19996dece13
parentd9d80deb1788bce9fe58b3b030baf804d9b32f50 (diff)
parenta9859274acb54b1193660d49d86749d71b820401 (diff)
downloadATCD-ac6579d1373aef165e76bcec9f471eca058c3f3f.tar.gz
Merge pull request #24 from mitza-oci/master
Adding fuzz.pl to Travis CI, fixing existing fuzz error.
-rw-r--r--.travis.yml2
-rw-r--r--ACE/ace/Dev_Poll_Reactor.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index a590f9abae0..eae990d0ca5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ compiler:
- gcc
env:
matrix:
+ - FUZZ=1
- CORBAEMICRO=1 ACEFORTAO=0
- CORBAECOMPACT=1 ACEFORTAO=0
- ACEFORTAO=1
@@ -50,6 +51,7 @@ before_script:
- cat $ACE_ROOT/include/makeinclude/platform_macros.GNU
script:
+ - if [ "$FUZZ" == "1" ]; then exec perl $ACE_ROOT/bin/fuzz.pl; fi
- perl $ACE_ROOT/bin/mwc.pl -type gnuace -workers 2 travis.mwc
- make -j 2
- perl $ACE_ROOT/bin/auto_run_tests.pl -l $TAO_ROOT/bin/travis-ci.lst
diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp
index c8ca2f96e3a..87d78be7197 100644
--- a/ACE/ace/Dev_Poll_Reactor.cpp
+++ b/ACE/ace/Dev_Poll_Reactor.cpp
@@ -1335,7 +1335,7 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard)
}
}
#endif /* ACE_HAS_EVENT_POLL */
- }
+ }
}
}
// Scope close handles eh ref count decrement, if needed.