GIT commit count fix that should work on all platforms (RedHat/CentOS…

… included)
ntop · May 27, 2015 · 22dc2dc · 22dc2dc
1 parent ca4fc87
commit 22dc2dc
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,11 @@ AX_PTHREAD
 if test -d ".git"; then :
      GIT_TAG=`git log -1 --format=%h`
      GIT_DATE=`git log -1 --format=%cd`
-     GIT_NUM=`git rev-list HEAD --count`
+     #
+     # On CentOS 6 `git rev-list HEAD --count` does not work
+     # 
+     #
+     GIT_NUM=`git log --pretty=oneline | wc -l`
      GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
      GIT_RELEASE="${PACKAGE_VERSION}-${GIT_BRANCH}-${GIT_NUM}-${GIT_TAG}"
 else

diff --git a/tests/pcap/whatsapp_login_call.pcap b/tests/pcap/whatsapp_login_call.pcap
diff --git a/tests/pcap/whatsapp_login_chat.pcap b/tests/pcap/whatsapp_login_chat.pcap
diff --git a/tests/result/whatsapp_login_call.pcap.out b/tests/result/whatsapp_login_call.pcap.out
@@ -0,0 +1,13 @@
+HTTP	11	726	3
+MDNS	8	952	4
+DHCP	10	3420	1
+STUN	689	85660	4
+ICMP	10	700	1
+SSL	8	589	2
+DropBox	4	2176	1
+Apple	127	28102	20
+WhatsApp	182	25154	2
+AppleiTunes	85	28087	2
+Spotify	3	258	1
+H323	70	9464	14
+RTCP	44	7818	2
diff --git a/tests/result/whatsapp_login_chat.pcap.out b/tests/result/whatsapp_login_chat.pcap.out
@@ -0,0 +1,6 @@
+MDNS	2	202	2
+DHCP	6	2052	1
+DropBox	2	1088	1
+Apple	50	23466	2
+WhatsApp	32	3243	2
+Spotify	1	86	1