From 4f131c224817517b9c8e32bf0eb99bda79431d73 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 9 Aug 2014 14:54:15 +0200
Subject: [ticket/12941] Add sami.conf.php for Travis CI.

PHPBB3-12941
---
 travis/sami.conf.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 travis/sami.conf.php

(limited to 'travis')

diff --git a/travis/sami.conf.php b/travis/sami.conf.php
new file mode 100644
index 0000000000..8e7cfa42e9
--- /dev/null
+++ b/travis/sami.conf.php
@@ -0,0 +1,19 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+require __DIR__ . '/../build/' . basename(__FILE__);
+
+// Removing the versions array key will make Sami use the current branch.
+unset($config['versions']);
+
+return new Sami\Sami($iterator, $config);
-- 
cgit v1.2.1


From 873d1c6d575345619fb2c8ed65b9742dec59a338 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 9 Aug 2014 15:06:34 +0200
Subject: [ticket/12941] Check for Sami parse errors on Travis CI.

PHPBB3-12941
---
 travis/check-sami-parse-errors.sh | 33 +++++++++++++++++++++++++++++++++
 travis/setup-phpbb.sh             |  1 +
 travis/setup-unbuffer.sh          | 14 ++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100755 travis/check-sami-parse-errors.sh
 create mode 100755 travis/setup-unbuffer.sh

(limited to 'travis')

diff --git a/travis/check-sami-parse-errors.sh b/travis/check-sami-parse-errors.sh
new file mode 100755
index 0000000000..847c54a61a
--- /dev/null
+++ b/travis/check-sami-parse-errors.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# This file is part of the phpBB Forum Software package.
+#
+# @copyright (c) phpBB Limited <https://www.phpbb.com>
+# @license GNU General Public License, version 2 (GPL-2.0)
+#
+# For full copyright and license information, please see
+# the docs/CREDITS.txt file.
+#
+set -e
+
+DB=$1
+TRAVIS_PHP_VERSION=$2
+
+if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ]
+then
+	# Workarounds for
+	# https://github.com/fabpot/Sami/issues/116
+	# and
+	# https://github.com/fabpot/Sami/issues/117
+	errors=$(
+		unbuffer phpBB/vendor/bin/sami.php parse travis/sami.conf.php -v | \
+		sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | \
+		grep "ERROR: " | \
+		tee /dev/tty | \
+		wc -l
+	)
+	if [ "$errors" != "0" ]
+	then
+		exit 1
+	fi
+fi
diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh
index f065faf8e2..d829772196 100755
--- a/travis/setup-phpbb.sh
+++ b/travis/setup-phpbb.sh
@@ -17,6 +17,7 @@ TRAVIS_PHP_VERSION=$2
 if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ]
 then
 	travis/setup-exiftool.sh
+	travis/setup-unbuffer.sh
 fi
 
 if [ "$DB" == "mariadb" ]
diff --git a/travis/setup-unbuffer.sh b/travis/setup-unbuffer.sh
new file mode 100755
index 0000000000..4423d1b8b6
--- /dev/null
+++ b/travis/setup-unbuffer.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# This file is part of the phpBB Forum Software package.
+#
+# @copyright (c) phpBB Limited <https://www.phpbb.com>
+# @license GNU General Public License, version 2 (GPL-2.0)
+#
+# For full copyright and license information, please see
+# the docs/CREDITS.txt file.
+#
+set -e
+
+sudo apt-get update
+sudo apt-get install -y expect-dev
-- 
cgit v1.2.1