From 31208b8c93694b602fe87979295c9d8c060d977a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Tue, 22 Mar 2016 18:08:39 +0100
Subject: [PATCH] Revert "common/travis: add consistency check on travis runs"

This reverts commit ff13ab493bf111f1bdd881f1be12ebb4fe583632 as it fails
and takes ages to complete.
---
 .travis.yml                        | 4 +---
 common/travis/bootstrap.sh         | 2 +-
 common/travis/build.sh             | 2 +-
 common/travis/consistency_check.sh | 7 -------
 common/travis/show_files.sh        | 2 +-
 common/travis/xlint.sh             | 2 +-
 6 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100755 common/travis/consistency_check.sh

diff --git a/.travis.yml b/.travis.yml
index 2dd29bca46d..1c64988cc56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,7 @@ env:
         - PATH=$PATH:$HOME/bin
 
     matrix:
-        - ACTION=xlint
-        - ACTION=consistency-check
+        - XLINT=1
         - ARCH=x86_64 BOOTSTRAP=x86_64
         - ARCH=i686 BOOTSTRAP=i686
         - ARCH=armv6hf BOOTSTRAP=x86_64
@@ -25,7 +24,6 @@ before_script:
     - common/travis/fetch_upstream.sh
     - common/travis/changed_templates.sh
     - common/travis/xlint.sh
-    - common/travis/consistency_check.sh
     - common/travis/bootstrap.sh $BOOTSTRAP
 
 script:
diff --git a/common/travis/bootstrap.sh b/common/travis/bootstrap.sh
index 351af8beb0a..755f70c2720 100755
--- a/common/travis/bootstrap.sh
+++ b/common/travis/bootstrap.sh
@@ -2,6 +2,6 @@
 #
 # bootstrap.sh
 
-[ "$ACTION" ] && exit 0
+[ "$XLINT" ] && exit 0
 
 ./xbps-src -H $HOME/hostdir binary-bootstrap $1
diff --git a/common/travis/build.sh b/common/travis/build.sh
index 9b3d6db9c0a..782e2facd7e 100755
--- a/common/travis/build.sh
+++ b/common/travis/build.sh
@@ -2,7 +2,7 @@
 #
 # build.sh
 
-[ "$ACTION" ] && exit 0 
+[ "$XLINT" ] && exit 0 
 
 if [ "$1" != "$2" ]; then
 	arch="-a $2"
diff --git a/common/travis/consistency_check.sh b/common/travis/consistency_check.sh
deleted file mode 100755
index 17483c8aee8..00000000000
--- a/common/travis/consistency_check.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# consistency_check.sh
-
-[ "$ACTION" = "consistency-check" ] || exit 0 
-
-./xbps-src consistency-check
diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh
index 2c30d266333..89f0c2104c1 100755
--- a/common/travis/show_files.sh
+++ b/common/travis/show_files.sh
@@ -2,7 +2,7 @@
 #
 # show_files.sh
 
-[ "$ACTION" ] && exit 0 
+[ "$XLINT" ] && exit 0 
 
 if [ "$1" != "$2" ]; then
 	arch="-a $2"
diff --git a/common/travis/xlint.sh b/common/travis/xlint.sh
index b99d95d98b8..2d5a71b71be 100755
--- a/common/travis/xlint.sh
+++ b/common/travis/xlint.sh
@@ -2,6 +2,6 @@
 #
 # xlint.sh
 
-[ "$ACTION" = "xlint" ] || exit 0 
+[ "$XLINT" ] || exit 0 
 
 awk '{ print "srcpkgs/" $0 "/template" }' /tmp/templates | xargs xlint