Skip to content

Commit

Permalink
Merge pull request #490 from appneta/4.3
Browse files Browse the repository at this point in the history
4.3
  • Loading branch information
fklassen authored Nov 10, 2018
2 parents 985668d + 0f594b0 commit 2d87447
Show file tree
Hide file tree
Showing 281 changed files with 7,181 additions and 6,772 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,14 @@ Makefile
Makefile.in
configure
config/
src/config.h.in

# Temporary files
*.tmp
.*.swp
*.tmproj
*.dirstamp
tcpdump.debug

# Misc files
tcpreplay.spec
Expand Down
25 changes: 14 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,33 @@ language: c

addons:
apt:
packages: [ libpcap-dev, autogen ]
packages:
- libpcap-dev

matrix:
include:
- os: osx
osx_image: xcode8.2
compiler: clang
before_install:
- brew update
- brew install autogen
- os: linux
dist: trusty
compiler: gcc
addons:
apt:
packages:
- libpcap-dev
- autogen
- os: linux
dist: trusty
compiler: clang
env: CI_BUILD_PREFIX=scan-build-3.5
env: CI_BUILD_PREFIX=scan-build-3.9
addons:
apt:
packages: [ libpcap-dev, clang-3.5, autogen ]
packages:
- libpcap-dev
- clang-3.9
- autogen

script:
- autoreconf -iv > build.log 2>&1 || (cat build.log && exit 1)
- ${CI_BUILD_PREFIX} ./configure --disable-local-libopts > build.log 2>&1 || (cat build.log && exit 1)
- ${CI_BUILD_PREFIX} ./configure --enable-local-libopts > build.log 2>&1 || (cat build.log && exit 1)
- ${CI_BUILD_PREFIX} make > build.log 2>&1 || (cat build.log && exit 1)
- make dist > build.log 2>&1 || (cat build.log && exit 1)
- sudo make test
- sudo make test || (cat test/test.log && exit 1)
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ Tcpreplay
=========
[![Build Status](https://travis-ci.org/appneta/tcpreplay.svg?branch=master)](https://travis-ci.org/appneta/tcpreplay)
[![Coverity Scan Build Status](https://scan.coverity.com/projects/12017/badge.svg)](https://scan.coverity.com/projects/12017)
[![Code Climate](https://codeclimate.com/github/appneta/tcpreplay.png)](https://codeclimate.com/github/appneta/tcpreplay)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/0e49d208c69e440182ba21109ecaf31d)](https://www.codacy.com/app/fklassen/tcpreplay?utm_source=github.com&utm_medium=referral&utm_content=appneta/tcpreplay&utm_campaign=badger)
[![Website](https://img.shields.io/website-up-down-green-red/http/shields.io.svg)](http://tcpreplay.appneta.com)

Expand Down
5 changes: 5 additions & 0 deletions autogen.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#!/bin/sh

set -e

cd $(dirname $0)

rm -f config/config.guess config/config.sub config/ltmain.sh 2>/dev/null
rm -f aclocal.m4 2>/dev/null
aclocal -I libopts/m4/
Expand Down
Loading

0 comments on commit 2d87447

Please sign in to comment.