From 0cc035b2e9f0007b9bb754faffa53ce04bc02e25 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 14 Oct 2014 09:21:22 -0500
Subject: testsuite: simplify installation, run pip freeze on failure

---
 testsuite/before_install.sh | 14 --------------
 testsuite/install.sh        |  5 +++++
 2 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100755 testsuite/before_install.sh

(limited to 'testsuite')

diff --git a/testsuite/before_install.sh b/testsuite/before_install.sh
deleted file mode 100755
index 2c80036cd..000000000
--- a/testsuite/before_install.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash -ex
-
-# before_install script for Travis-CI
-
-PYVER=$(python -c 'import sys;print(".".join(str(v) for v in sys.version_info[0:2]))')
-
-sudo apt-get update -qq
-sudo apt-get install -qq swig libxml2-utils
-if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then
-    if [[ ${PYVER:0:1} == "2" ]]; then
-        sudo apt-get install -y yum libaugeas0 augeas-lenses libacl1-dev \
-            libssl-dev
-    fi
-fi
diff --git a/testsuite/install.sh b/testsuite/install.sh
index 6f36d4bef..42f8b9243 100755
--- a/testsuite/install.sh
+++ b/testsuite/install.sh
@@ -2,6 +2,9 @@
 
 # install script for Travis-CI
 
+sudo apt-get update -qq
+sudo apt-get install swig libxml2-utils
+
 pip install -r testsuite/requirements.txt --use-mirrors
 
 PYVER=$(python -c 'import sys;print(".".join(str(v) for v in sys.version_info[0:2]))')
@@ -16,6 +19,8 @@ if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then
     if [[ ${PYVER:0:1} == "2" ]]; then
         # django supports py3k, but South doesn't, and the django bits
         # in bcfg2 require South
+        sudo apt-get install -y yum libaugeas0 augeas-lenses libacl1-dev \
+            libssl-dev
         pip install cheetah 'South<0.8'
         pip install m2crypto
     fi
-- 
cgit v1.2.3-1-g7c22