From db3331dc20b32e8bcb85d9721015a3604aa06083 Mon Sep 17 00:00:00 2001
From: ltagliamonte <luigi.tagliamonte86@gmail.com>
Date: Mon, 20 Jun 2016 12:45:36 -0700
Subject: [PATCH 01/16] split travis steps on multiple scripts

---
 .travis-scripts/linux/before_install.sh |  3 ++
 .travis-scripts/linux/build.sh          | 59 +++++++++++++++++++++
 .travis-scripts/linux/install.sh        |  4 ++
 .travis.yml                             | 70 +++----------------------
 4 files changed, 72 insertions(+), 64 deletions(-)
 create mode 100755 .travis-scripts/linux/before_install.sh
 create mode 100755 .travis-scripts/linux/build.sh
 create mode 100755 .travis-scripts/linux/install.sh

diff --git a/.travis-scripts/linux/before_install.sh b/.travis-scripts/linux/before_install.sh
new file mode 100755
index 0000000000..3d49a410a4
--- /dev/null
+++ b/.travis-scripts/linux/before_install.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+sudo apt-get update
diff --git a/.travis-scripts/linux/build.sh b/.travis-scripts/linux/build.sh
new file mode 100755
index 0000000000..b8c62e08f6
--- /dev/null
+++ b/.travis-scripts/linux/build.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+set -e
+export CC="gcc-4.8"
+export CXX="g++-4.8"
+wget https://s3.amazonaws.com/download.draios.com/dependencies/cmake-3.3.2.tar.gz
+tar -xzf cmake-3.3.2.tar.gz
+cd cmake-3.3.2
+./bootstrap --prefix=/usr
+make
+sudo make install
+cd ..
+mkdir build
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+make VERBOSE=1
+make package
+cd ..
+test/sysdig_trace_regression.sh build/userspace/sysdig/sysdig build/userspace/sysdig/chisels $TRAVIS_BRANCH
+rm -rf build
+pushd $(mktemp -d --tmpdir sysdig.XXXXXXXXXX)
+wget http://download.draios.com/dependencies/zlib-1.2.8.tar.gz
+tar -xzf zlib-1.2.8.tar.gz
+cd zlib-1.2.8
+./configure
+make
+sudo make install
+cd ..
+wget https://github.com/open-source-parsers/jsoncpp/archive/0.10.5.tar.gz
+tar zxvf 0.10.5.tar.gz
+cd jsoncpp-0.10.5
+cmake -DBUILD_SHARED_LIBS=ON .
+make
+sudo make install
+cd ..
+wget https://s3.amazonaws.com/download.draios.com/dependencies/libb64-1.2.src.zip
+unzip libb64-1.2.src.zip
+cd libb64-1.2
+make
+sudo cp -r include/* /usr/local/include/
+sudo cp src/libb64.a /usr/local/lib/
+cd ..
+wget http://download.draios.com/dependencies/jq-1.5.tar.gz
+tar -xzf jq-1.5.tar.gz
+cd jq-1.5
+./configure --disable-maintainer-mode
+make LDFLAGS=-all-static
+sudo cp -r ./*.h /usr/local/include/
+sudo cp .libs/libjq.a /usr/local/lib/
+cd ..
+popd
+rm -rf userspace/libsinsp/third-party/jsoncpp
+sudo apt-get install libncurses5-dev libluajit-5.1-dev libcurl4-openssl-dev libssl-dev
+mkdir build
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_BUNDLED_DEPS=OFF
+make VERBOSE=1
+make package
+cd ..
+test/sysdig_trace_regression.sh build/userspace/sysdig/sysdig build/userspace/sysdig/chisels $TRAVIS_BRANCH
\ No newline at end of file
diff --git a/.travis-scripts/linux/install.sh b/.travis-scripts/linux/install.sh
new file mode 100755
index 0000000000..273c7f948e
--- /dev/null
+++ b/.travis-scripts/linux/install.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+sudo apt-get --force-yes install g++-4.8
+sudo apt-get install rpm linux-headers-$(uname -r)
+sudo apt-get purge libncurses5-dev cmake libcurl4-openssl-dev zlib1g-dev
diff --git a/.travis.yml b/.travis.yml
index c5ad86cd3c..8219e6c5f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,79 +1,21 @@
 language: c
+os:
+    - linux
 env:
     - BUILD_TYPE=Debug
     - BUILD_TYPE=Release
 before_install:
-    - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-    - sudo apt-get update
+    - .travis-scripts/${TRAVIS_OS_NAME}/before_install.sh
 install:
-    - sudo apt-get --force-yes install g++-4.8
-    - sudo apt-get install rpm linux-headers-$(uname -r)
-    - sudo apt-get purge libncurses5-dev cmake libcurl4-openssl-dev zlib1g-dev
+    - .travis-scripts/${TRAVIS_OS_NAME}/install.sh
 before_script:
     - export KERNELDIR=/lib/modules/$(ls /lib/modules | sort | head -1)/build
 script:
-    - set -e
-    - export CC="gcc-4.8"
-    - export CXX="g++-4.8"
-    - wget https://s3.amazonaws.com/download.draios.com/dependencies/cmake-3.3.2.tar.gz
-    - tar -xzf cmake-3.3.2.tar.gz
-    - cd cmake-3.3.2
-    - ./bootstrap --prefix=/usr
-    - make
-    - sudo make install
-    - cd ..
-    - mkdir build
-    - cd build
-    - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
-    - make VERBOSE=1
-    - make package
-    - cd ..
-    - test/sysdig_trace_regression.sh build/userspace/sysdig/sysdig build/userspace/sysdig/chisels $TRAVIS_BRANCH
-    - rm -rf build
-    - pushd $(mktemp -d --tmpdir sysdig.XXXXXXXXXX)
-    - wget http://download.draios.com/dependencies/zlib-1.2.8.tar.gz
-    - tar -xzf zlib-1.2.8.tar.gz
-    - cd zlib-1.2.8
-    - ./configure
-    - make
-    - sudo make install
-    - cd ..
-    - wget https://github.com/open-source-parsers/jsoncpp/archive/0.10.5.tar.gz
-    - tar zxvf 0.10.5.tar.gz
-    - cd jsoncpp-0.10.5
-    - cmake -DBUILD_SHARED_LIBS=ON .
-    - make
-    - sudo make install
-    - cd ..
-    - wget https://s3.amazonaws.com/download.draios.com/dependencies/libb64-1.2.src.zip
-    - unzip libb64-1.2.src.zip
-    - cd libb64-1.2
-    - make
-    - sudo cp -r include/* /usr/local/include/
-    - sudo cp src/libb64.a /usr/local/lib/
-    - cd ..
-    - wget http://download.draios.com/dependencies/jq-1.5.tar.gz
-    - tar -xzf jq-1.5.tar.gz
-    - cd jq-1.5
-    - ./configure --disable-maintainer-mode
-    - make LDFLAGS=-all-static
-    - sudo cp -r ./*.h /usr/local/include/
-    - sudo cp .libs/libjq.a /usr/local/lib/
-    - cd ..
-    - popd
-    - rm -rf userspace/libsinsp/third-party/jsoncpp
-    - sudo apt-get install libncurses5-dev libluajit-5.1-dev libcurl4-openssl-dev libssl-dev
-    - mkdir build
-    - cd build
-    - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_BUNDLED_DEPS=OFF
-    - make VERBOSE=1
-    - make package
-    - cd ..
-    - test/sysdig_trace_regression.sh build/userspace/sysdig/sysdig build/userspace/sysdig/chisels $TRAVIS_BRANCH
+    - .travis-scripts/${TRAVIS_OS_NAME}/build.sh
 notifications:
   webhooks:
     urls:
       - https://webhooks.gitter.im/e/fdbc2356fb0ea2f15033
     on_success: change
     on_failure: always
-    on_start: never
+    on_start: never
\ No newline at end of file

From c434125d58621dae355e52bb95d8896a48e62758 Mon Sep 17 00:00:00 2001
From: ltagliamonte <luigi.tagliamonte86@gmail.com>
Date: Mon, 20 Jun 2016 15:34:39 -0700
Subject: [PATCH 02/16] cleanup

---
 .travis-scripts/linux/before_install.sh | 2 +-
 .travis-scripts/linux/install.sh        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis-scripts/linux/before_install.sh b/.travis-scripts/linux/before_install.sh
index 3d49a410a4..8e63652597 100755
--- a/.travis-scripts/linux/before_install.sh
+++ b/.travis-scripts/linux/before_install.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-sudo apt-get update
+sudo apt-get update
\ No newline at end of file
diff --git a/.travis-scripts/linux/install.sh b/.travis-scripts/linux/install.sh
index 273c7f948e..c562876f00 100755
--- a/.travis-scripts/linux/install.sh
+++ b/.travis-scripts/linux/install.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 sudo apt-get --force-yes install g++-4.8
 sudo apt-get install rpm linux-headers-$(uname -r)
-sudo apt-get purge libncurses5-dev cmake libcurl4-openssl-dev zlib1g-dev
+sudo apt-get purge libncurses5-dev cmake libcurl4-openssl-dev zlib1g-dev
\ No newline at end of file

From e66e6336ddf72556fe351a4abe80f7377c5c3415 Mon Sep 17 00:00:00 2001
From: ltagliamonte <luigi.tagliamonte86@gmail.com>
Date: Mon, 20 Jun 2016 15:35:11 -0700
Subject: [PATCH 03/16] mac os build files

---
 .travis-scripts/osx/before_install.sh | 2 ++
 .travis-scripts/osx/build.sh          | 7 +++++++
 .travis-scripts/osx/install.sh        | 3 +++
 3 files changed, 12 insertions(+)
 create mode 100755 .travis-scripts/osx/before_install.sh
 create mode 100755 .travis-scripts/osx/build.sh
 create mode 100755 .travis-scripts/osx/install.sh

diff --git a/.travis-scripts/osx/before_install.sh b/.travis-scripts/osx/before_install.sh
new file mode 100755
index 0000000000..598ac0be61
--- /dev/null
+++ b/.travis-scripts/osx/before_install.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+brew update
\ No newline at end of file
diff --git a/.travis-scripts/osx/build.sh b/.travis-scripts/osx/build.sh
new file mode 100755
index 0000000000..ebb66684fd
--- /dev/null
+++ b/.travis-scripts/osx/build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+mkdir build
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_BUNDLED_LUAJIT=OFF -DUSE_BUNDLED_ZLIB=OFF -DCMAKE_C_FLAGS_RELEASE=-DNDEBUG -DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_VERBOSE_MAKEFILE=ON
+make install
+sysdig --version
\ No newline at end of file
diff --git a/.travis-scripts/osx/install.sh b/.travis-scripts/osx/install.sh
new file mode 100755
index 0000000000..9449ff4217
--- /dev/null
+++ b/.travis-scripts/osx/install.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+brew install cmake
+brew install luajit
\ No newline at end of file

From 8e2f6156ea9cf87a19e12224751593d616cea904 Mon Sep 17 00:00:00 2001
From: ltagliamonte <luigi.tagliamonte86@gmail.com>
Date: Mon, 20 Jun 2016 15:39:57 -0700
Subject: [PATCH 04/16] adding mac to os list in travis yaml file

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 8219e6c5f9..38f7ab1b21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: c
 os:
     - linux
+    - osx
 env:
     - BUILD_TYPE=Debug
     - BUILD_TYPE=Release

From c598a1ee57c9327fa9aadb45740f0d5ca5ef4bc3 Mon Sep 17 00:00:00 2001
From: ltagliamonte <luigi.tagliamonte86@gmail.com>
Date: Mon, 20 Jun 2016 17:20:56 -0700
Subject: [PATCH 05/16] install_if_not_present

---
 .travis-scripts/osx/install.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.travis-scripts/osx/install.sh b/.travis-scripts/osx/install.sh
index 9449ff4217..ac10fee81b 100755
--- a/.travis-scripts/osx/install.sh
+++ b/.travis-scripts/osx/install.sh
@@ -1,3 +1,11 @@
 #!/bin/bash
-brew install cmake
-brew install luajit
\ No newline at end of file
+function install_if_not_present(){
+	brew ls | grep ${1}
+	if [[ ${?} -ne 0 ]]; then
+		brew install ${1}
+	else
+		echo "dependency ${1} already installed"
+	fi
+}
+install_if_not_present "cmake"
+install_if_not_present "luajit"
\ No newline at end of file

From c3a729a90b41aa948ae95398fd10d7631977cfb9 Mon Sep 17 00:00:00 2001
From: ltagliamonte <luigi.tagliamonte86@gmail.com>
Date: Mon, 20 Jun 2016 18:18:13 -0700
Subject: [PATCH 06/16] compile flags and tests

---
 .travis-scripts/osx/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis-scripts/osx/build.sh b/.travis-scripts/osx/build.sh
index ebb66684fd..1fb385ae70 100755
--- a/.travis-scripts/osx/build.sh
+++ b/.travis-scripts/osx/build.sh
@@ -2,6 +2,6 @@
 set -e
 mkdir build
 cd build
-cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_BUNDLED_LUAJIT=OFF -DUSE_BUNDLED_ZLIB=OFF -DCMAKE_C_FLAGS_RELEASE=-DNDEBUG -DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_VERBOSE_MAKEFILE=ON
+cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_BUNDLED_LUAJIT=OFF -DUSE_BUNDLED_ZLIB=OFF
 make install
-sysdig --version
\ No newline at end of file
+../test/sysdig_trace_regression.sh $(which sysdig) ./userspace/sysdig/chisels $TRAVIS_BRANCH
\ No newline at end of file

From 5b21589b3574b17652f53a774f8b2a70c7554ff4 Mon Sep 17 00:00:00 2001
From: ltagliamonte <luigi.tagliamonte86@gmail.com>
Date: Mon, 20 Jun 2016 18:19:51 -0700
Subject: [PATCH 07/16] make script compatible with osx

---
 test/sysdig_trace_regression.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/test/sysdig_trace_regression.sh b/test/sysdig_trace_regression.sh
index 05c2d27677..8e9d1aa765 100755
--- a/test/sysdig_trace_regression.sh
+++ b/test/sysdig_trace_regression.sh
@@ -1,12 +1,19 @@
 #!/bin/bash
 set -eu
 
-SCRIPT=$(readlink -f $0)
-BASEDIR=$(dirname $SCRIPT)
+unamestr=`uname`
+if [[ "$unamestr" == 'Linux' ]]; then
+    SCRIPT=$(readlink -f $0)
+    TMPBASE=${4:-$(mktemp -d --tmpdir sysdig.XXXXXXXXXX)}
+elif [[ "$unamestr" == 'Darwin' ]]; then
+	SCRIPT=$(greadlink -f $0)
+	unset TMPDIR #make shure that mktemp on mac will generate the folder under /tmp
+    TMPBASE=${4:-$(mktemp -d -t sysdig)}
+fi
 
+BASEDIR=$(dirname $SCRIPT)
 SYSDIG=$1
 CHISELS=$2
-TMPBASE=${4:-$(mktemp -d --tmpdir sysdig.XXXXXXXXXX)}
 TRACEDIR="${TMPBASE}/traces"
 RESULTDIR="${TMPBASE}/results"
 BASELINEDIR="${TMPBASE}/baseline"

From 7e593e816795177c5a9c5143e7036a25bef64572 Mon Sep 17 00:00:00 2001
From: ltagliamonte <luigi.tagliamonte86@gmail.com>
Date: Tue, 21 Jun 2016 07:59:49 -0700
Subject: [PATCH 08/16] install coreutils

---
 .travis-scripts/osx/install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis-scripts/osx/install.sh b/.travis-scripts/osx/install.sh
index ac10fee81b..6ae2b17586 100755
--- a/.travis-scripts/osx/install.sh
+++ b/.travis-scripts/osx/install.sh
@@ -8,4 +8,5 @@ function install_if_not_present(){
 	fi
 }
 install_if_not_present "cmake"
-install_if_not_present "luajit"
\ No newline at end of file
+install_if_not_present "luajit"
+install_if_not_present "coreutils"
\ No newline at end of file

From 97213b6e20ba03bd95a53bcd88f564779420baf5 Mon Sep 17 00:00:00 2001
From: ltagliamonte <luigi.tagliamonte86@gmail.com>
Date: Tue, 21 Jun 2016 09:42:17 -0700
Subject: [PATCH 09/16] temp remove linux for faster iteration

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 38f7ab1b21..fad2b49695 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: c
 os:
-    - linux
+    #- linux
     - osx
 env:
     - BUILD_TYPE=Debug

From e35ee2d62966b99fcd8a1864956ae475e9b83d4c Mon Sep 17 00:00:00 2001
From: ltagliamonte <luigi.tagliamonte86@gmail.com>
Date: Tue, 21 Jun 2016 09:43:07 -0700
Subject: [PATCH 10/16] debug

---
 test/sysdig_trace_regression.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/sysdig_trace_regression.sh b/test/sysdig_trace_regression.sh
index 8e9d1aa765..b718938a5d 100755
--- a/test/sysdig_trace_regression.sh
+++ b/test/sysdig_trace_regression.sh
@@ -111,6 +111,6 @@ $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-cps" $TRACEDIR $RESULTDIR/ps
 $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-j -n 10000" $TRACEDIR $RESULTDIR/fd_fields_json $BASELINEDIR/fd_fields_json || ret=1
 # Sessions
 $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-p '*%evt.num %evt.outputtime %evt.cpu %proc.name (%thread.tid) %evt.dir %evt.type %evt.info sid=%proc.sid sname=%proc.sname'" $TRACEDIR $RESULTDIR/sessions $BASELINEDIR/sessions || ret=1
-
+set -x
 rm -rf "${TMPBASE}"
 exit $ret

From 7363c3edfddfaabc3755bb91965ebc0f23cd55d0 Mon Sep 17 00:00:00 2001
From: ltagliamonte <luigi.tagliamonte86@gmail.com>
Date: Thu, 23 Jun 2016 09:56:12 -0700
Subject: [PATCH 11/16] verbose debug

---
 test/sysdig_trace_regression.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/sysdig_trace_regression.sh b/test/sysdig_trace_regression.sh
index b718938a5d..671af07f01 100755
--- a/test/sysdig_trace_regression.sh
+++ b/test/sysdig_trace_regression.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -eu
+set -exu
 
 unamestr=`uname`
 if [[ "$unamestr" == 'Linux' ]]; then
@@ -111,6 +111,6 @@ $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-cps" $TRACEDIR $RESULTDIR/ps
 $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-j -n 10000" $TRACEDIR $RESULTDIR/fd_fields_json $BASELINEDIR/fd_fields_json || ret=1
 # Sessions
 $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-p '*%evt.num %evt.outputtime %evt.cpu %proc.name (%thread.tid) %evt.dir %evt.type %evt.info sid=%proc.sid sname=%proc.sname'" $TRACEDIR $RESULTDIR/sessions $BASELINEDIR/sessions || ret=1
-set -x
+
 rm -rf "${TMPBASE}"
 exit $ret

From 5e31f0f4d7e041989af17ee5bf5d5eed4b4c8634 Mon Sep 17 00:00:00 2001
From: Alex Fabijanic <alex@pocoproject.org>
Date: Fri, 17 Feb 2017 17:47:01 -0600
Subject: [PATCH 12/16] Regression tests are failing on Mac build #614

---
 test/sysdig_trace_regression.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/sysdig_trace_regression.sh b/test/sysdig_trace_regression.sh
index 671af07f01..8036d28881 100755
--- a/test/sysdig_trace_regression.sh
+++ b/test/sysdig_trace_regression.sh
@@ -88,7 +88,7 @@ $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-cspy_port 80" $TRACEDIR $RESU
 $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-ctopconns" $TRACEDIR $RESULTDIR/topconns $BASELINEDIR/topconns || ret=1
 $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-pc -ctopconns" $TRACEDIR $RESULTDIR/topconns_container $BASELINEDIR/topconns_container || ret=1
 $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-ctopcontainers_net" $TRACEDIR $RESULTDIR/topcontainers_net $BASELINEDIR/topcontainers_net || ret=1
-$BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-ctopports_server" $TRACEDIR $RESULTDIR/topports_server $BASELINEDIR/topports_server || ret=1
+$BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-pc -ctopports_server" $TRACEDIR $RESULTDIR/topports_server $BASELINEDIR/topports_server || ret=1
 $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-ctopprocs_net" $TRACEDIR $RESULTDIR/topprocs_net $BASELINEDIR/topprocs_net || ret=1
 # Category: Performance
 $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-cbottlenecks" $TRACEDIR $RESULTDIR/bottlenecks $BASELINEDIR/bottlenecks || ret=1
@@ -112,5 +112,5 @@ $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-j -n 10000" $TRACEDIR $RESULT
 # Sessions
 $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-p '*%evt.num %evt.outputtime %evt.cpu %proc.name (%thread.tid) %evt.dir %evt.type %evt.info sid=%proc.sid sname=%proc.sname'" $TRACEDIR $RESULTDIR/sessions $BASELINEDIR/sessions || ret=1
 
-rm -rf "${TMPBASE}"
+#rm -rf "${TMPBASE}"
 exit $ret

From cb641ebab562ad7771167f2b587e1259d159a4bb Mon Sep 17 00:00:00 2001
From: Alex Fabijanic <alex@pocoproject.org>
Date: Fri, 17 Feb 2017 17:48:36 -0600
Subject: [PATCH 13/16] uncomment rm

---
 test/sysdig_trace_regression.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/sysdig_trace_regression.sh b/test/sysdig_trace_regression.sh
index 8036d28881..3a74315263 100755
--- a/test/sysdig_trace_regression.sh
+++ b/test/sysdig_trace_regression.sh
@@ -112,5 +112,5 @@ $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-j -n 10000" $TRACEDIR $RESULT
 # Sessions
 $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-p '*%evt.num %evt.outputtime %evt.cpu %proc.name (%thread.tid) %evt.dir %evt.type %evt.info sid=%proc.sid sname=%proc.sname'" $TRACEDIR $RESULTDIR/sessions $BASELINEDIR/sessions || ret=1
 
-#rm -rf "${TMPBASE}"
+rm -rf "${TMPBASE}"
 exit $ret

From 3cf5a575ad60d0f1e1839b796182429d5ba516d4 Mon Sep 17 00:00:00 2001
From: Alex Fabijanic <alex@pocoproject.org>
Date: Mon, 20 Feb 2017 20:52:50 -0600
Subject: [PATCH 14/16] revert -pc and fix topports_server script #614

---
 test/sysdig_trace_regression.sh              | 2 +-
 userspace/sysdig/chisels/topports_server.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/sysdig_trace_regression.sh b/test/sysdig_trace_regression.sh
index 3a74315263..671af07f01 100755
--- a/test/sysdig_trace_regression.sh
+++ b/test/sysdig_trace_regression.sh
@@ -88,7 +88,7 @@ $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-cspy_port 80" $TRACEDIR $RESU
 $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-ctopconns" $TRACEDIR $RESULTDIR/topconns $BASELINEDIR/topconns || ret=1
 $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-pc -ctopconns" $TRACEDIR $RESULTDIR/topconns_container $BASELINEDIR/topconns_container || ret=1
 $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-ctopcontainers_net" $TRACEDIR $RESULTDIR/topcontainers_net $BASELINEDIR/topcontainers_net || ret=1
-$BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-pc -ctopports_server" $TRACEDIR $RESULTDIR/topports_server $BASELINEDIR/topports_server || ret=1
+$BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-ctopports_server" $TRACEDIR $RESULTDIR/topports_server $BASELINEDIR/topports_server || ret=1
 $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-ctopprocs_net" $TRACEDIR $RESULTDIR/topprocs_net $BASELINEDIR/topprocs_net || ret=1
 # Category: Performance
 $BASEDIR/sysdig_batch_parser.sh $SYSDIG $CHISELS "-cbottlenecks" $TRACEDIR $RESULTDIR/bottlenecks $BASELINEDIR/bottlenecks || ret=1
diff --git a/userspace/sysdig/chisels/topports_server.lua b/userspace/sysdig/chisels/topports_server.lua
index cb59e2fa40..24060176e1 100644
--- a/userspace/sysdig/chisels/topports_server.lua
+++ b/userspace/sysdig/chisels/topports_server.lua
@@ -37,7 +37,7 @@ function on_init()
 
 	if print_container then
 		chisel.exec("table_generator",
-					"fd.sproto,container.name",
+					"fd.sport,container.name",
 					"Srv Port,container.name",
 					"evt.rawarg.res",
 					"Bytes",
@@ -46,7 +46,7 @@ function on_init()
 					"bytes")
 	else
 		chisel.exec("table_generator",
-					"fd.sproto",
+					"fd.sport",
 					"Srv Port",
 					"evt.rawarg.res",
 					"Bytes",

From 1db372f4f804298e9b10b218558b0783c9033dbc Mon Sep 17 00:00:00 2001
From: ltagliamonte <luigi.tagliamonte86@gmail.com>
Date: Tue, 21 Feb 2017 11:09:51 -0800
Subject: [PATCH 15/16] enable linux

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index eb9f401964..d16ac50d45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: c
 os:
-    #- linux
+    - linux
     - osx
 env:
     - BUILD_TYPE=Debug

From 3fad13848bb23acade35c76c9a4e49b59329c685 Mon Sep 17 00:00:00 2001
From: ltagliamonte <luigi.tagliamonte86@gmail.com>
Date: Tue, 21 Feb 2017 11:19:01 -0800
Subject: [PATCH 16/16] report dev changes for linux build to this branch

---
 .travis-scripts/linux/build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis-scripts/linux/build.sh b/.travis-scripts/linux/build.sh
index b8c62e08f6..53b8e1c126 100755
--- a/.travis-scripts/linux/build.sh
+++ b/.travis-scripts/linux/build.sh
@@ -44,7 +44,8 @@ tar -xzf jq-1.5.tar.gz
 cd jq-1.5
 ./configure --disable-maintainer-mode
 make LDFLAGS=-all-static
-sudo cp -r ./*.h /usr/local/include/
+sudo cp ./jq.h /usr/local/include/
+sudo cp ./jv.h /usr/local/include/
 sudo cp .libs/libjq.a /usr/local/lib/
 cd ..
 popd