From c525fdc6bd79684da196e0fe7ca5630c1bac8f21 Mon Sep 17 00:00:00 2001
From: Amar Tumballi <amarts@redhat.com>
Date: Mon, 10 Jun 2019 09:39:38 +0530
Subject: tests: keep glfsxmp in tests directory

this is critical so all the tests will be contained in the same
directory, and one can just 'cp -a tests/ <any-location>/' and
run glusterfs tests.

only 'glfsxmp.c' was an exception as it was just copying the
file from api example directory. Now moved it to tests.

updates: bz#1193929
Change-Id: I00359d64be580bffc5b3c3a090968d86c2c6952a
Signed-off-by: Amar Tumballi <amarts@redhat.com>
---
 tests/line-coverage/errorgen-coverage.t      | 4 +---
 tests/line-coverage/namespace-linecoverage.t | 2 +-
 tests/line-coverage/old-protocol.t           | 2 +-
 tests/line-coverage/quiesce-coverage.t       | 2 +-
 tests/line-coverage/shard-coverage.t         | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'tests/line-coverage')

diff --git a/tests/line-coverage/errorgen-coverage.t b/tests/line-coverage/errorgen-coverage.t
index e95c4847b22..ddced541735 100755
--- a/tests/line-coverage/errorgen-coverage.t
+++ b/tests/line-coverage/errorgen-coverage.t
@@ -22,7 +22,7 @@ TEST $CLI volume start $V0;
 
 TEST $GFS -s $H0 --volfile-id $V0 $M1;
 
-cp $(dirname ${0})/../../api/examples/glfsxmp.c glfsxmp.c
+cp $(dirname ${0})/../basic/gfapi/glfsxmp-coverage.c glfsxmp.c
 build_tester ./glfsxmp.c -lgfapi
 for i in $(seq 1 10); do
     # as there is error-gen, there can be errors, so no
@@ -34,8 +34,6 @@ done
 TEST cleanup_tester ./glfsxmp
 TEST rm ./glfsxmp.c
 
-
-
 ## Finish up
 TEST $CLI volume stop $V0;
 
diff --git a/tests/line-coverage/namespace-linecoverage.t b/tests/line-coverage/namespace-linecoverage.t
index 0b7d4fe34f4..8de6a0f279b 100644
--- a/tests/line-coverage/namespace-linecoverage.t
+++ b/tests/line-coverage/namespace-linecoverage.t
@@ -30,7 +30,7 @@ open $M1/namespace/hey
 ## which covers maximum fops
 TEST $(dirname $0)/../basic/rpc-coverage.sh $M1
 
-TEST cp $(dirname ${0})/../../api/examples/glfsxmp.c glfsxmp.c
+TEST cp $(dirname ${0})/../basic/gfapi/glfsxmp-coverage.c glfsxmp.c
 TEST build_tester ./glfsxmp.c -lgfapi
 TEST ./glfsxmp $V0 $H0
 TEST cleanup_tester ./glfsxmp
diff --git a/tests/line-coverage/old-protocol.t b/tests/line-coverage/old-protocol.t
index 46ea1f3b019..5676e5636db 100755
--- a/tests/line-coverage/old-protocol.t
+++ b/tests/line-coverage/old-protocol.t
@@ -28,7 +28,7 @@ TEST $GFS -s $H0 --volfile-id $V0 $M1;
 ## which covers maximum fops
 TEST $(dirname $0)/../basic/rpc-coverage.sh $M1
 
-TEST cp $(dirname ${0})/../../api/examples/glfsxmp.c glfsxmp.c
+TEST cp $(dirname ${0})/../basic/gfapi/glfsxmp-coverage.c glfsxmp.c
 TEST build_tester ./glfsxmp.c -lgfapi
 TEST ./glfsxmp $V0 $H0
 TEST cleanup_tester ./glfsxmp
diff --git a/tests/line-coverage/quiesce-coverage.t b/tests/line-coverage/quiesce-coverage.t
index 56c96ebef54..ca29343451e 100755
--- a/tests/line-coverage/quiesce-coverage.t
+++ b/tests/line-coverage/quiesce-coverage.t
@@ -35,7 +35,7 @@ TEST $GFS -s $H0 --volfile-id $V0 $M1;
 ## which covers maximum fops
 TEST $(dirname $0)/../basic/rpc-coverage.sh $M1
 
-TEST cp $(dirname ${0})/../../api/examples/glfsxmp.c glfsxmp.c
+TEST cp $(dirname ${0})/../basic/gfapi/glfsxmp-coverage.c glfsxmp.c
 TEST build_tester ./glfsxmp.c -lgfapi
 TEST ./glfsxmp $V0 $H0
 TEST cleanup_tester ./glfsxmp
diff --git a/tests/line-coverage/shard-coverage.t b/tests/line-coverage/shard-coverage.t
index 5e18d28c998..1797999c146 100644
--- a/tests/line-coverage/shard-coverage.t
+++ b/tests/line-coverage/shard-coverage.t
@@ -16,7 +16,7 @@ EXPECT 'Started' volinfo_field $V0 'Status'
 
 # It is good to copy the file locally and build it, so the scope remains
 # inside tests directory.
-TEST cp $(dirname ${0})/../../api/examples/glfsxmp.c glfsxmp.c
+TEST cp $(dirname ${0})/../basic/gfapi/glfsxmp-coverage.c glfsxmp.c
 TEST build_tester ./glfsxmp.c -lgfapi
 TEST ./glfsxmp $V0 $H0
 TEST cleanup_tester ./glfsxmp
-- 
cgit