From 7e851b4f3d0e231e601842df6171fd528f16aa47 Mon Sep 17 00:00:00 2001
From: Oleksandr Natalenko <oleksandr@natalenko.name>
Date: Sat, 20 Aug 2016 22:05:20 +0300
Subject: tests: do not let gfapi-trunc fail

gfapi-trunc test was mistakenly backported as .t in through
http://review.gluster.org/15149. gfapi tests are currently not
compiled/linked correctly in release-3.8 and earlier. Until then, tests
need to be run manually, and not in our automated regression framework.

Change-Id: I45d69564b4340475d4ea60f825fa7288dad65849
BUG: 1368738
Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Reviewed-on: http://review.gluster.org/15223
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.org>
---
 tests/basic/gfapi/gfapi-trunc.sh | 29 +++++++++++++++++++++++++++++
 tests/basic/gfapi/gfapi-trunc.t  | 29 -----------------------------
 2 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100755 tests/basic/gfapi/gfapi-trunc.sh
 delete mode 100644 tests/basic/gfapi/gfapi-trunc.t

(limited to 'tests')

diff --git a/tests/basic/gfapi/gfapi-trunc.sh b/tests/basic/gfapi/gfapi-trunc.sh
new file mode 100755
index 00000000000..ce604f4d098
--- /dev/null
+++ b/tests/basic/gfapi/gfapi-trunc.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+
+TEST glusterd
+
+TEST $CLI volume create $V0 localhost:$B0/brick1;
+EXPECT 'Created' volinfo_field $V0 'Status';
+
+TEST $CLI volume start $V0;
+EXPECT 'Started' volinfo_field $V0 'Status';
+
+logdir=`gluster --print-logdir`
+
+# Special Snowflake NetBSD isn't set up to run tests that involve building
+# executables.  Until that's fixed somewhere else, patch things up here.
+if [ x"$OSTYPE" = x"NetBSD" ]; then
+	mkdir -p $logdir
+	extra_cflags="-I/build/install/include -L/build/install/lib"
+fi
+
+build_tester $(dirname $0)/gfapi-trunc.c -lgfapi -o $(dirname $0)/gfapi-trunc
+
+TEST ./$(dirname $0)/gfapi-trunc $V0 $logdir/gfapi-trunc.log
+
+cleanup_tester $(dirname $0)/gfapi-trunc
+
+cleanup;
diff --git a/tests/basic/gfapi/gfapi-trunc.t b/tests/basic/gfapi/gfapi-trunc.t
deleted file mode 100644
index 134e78de1fd..00000000000
--- a/tests/basic/gfapi/gfapi-trunc.t
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-
-TEST glusterd
-
-TEST $CLI volume create $V0 ${H0}:$B0/brick1;
-EXPECT 'Created' volinfo_field $V0 'Status';
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-logdir=`gluster --print-logdir`
-
-# Special Snowflake NetBSD isn't set up to run tests that involve building
-# executables.  Until that's fixed somewhere else, patch things up here.
-if [ x"$OSTYPE" = x"NetBSD" ]; then
-	mkdir -p $logdir
-	extra_cflags="-I/build/install/include -L/build/install/lib"
-fi
-
-build_tester $(dirname $0)/gfapi-trunc.c -lgfapi ${extra_cflags}
-
-TEST ./$(dirname $0)/gfapi-trunc $V0 $logdir/gfapi-trunc.log
-
-cleanup_tester $(dirname $0)/gfapi-trunc
-
-cleanup;
-- 
cgit