From ffb12bdc29764f89f642d064daca941a5fd5c775 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Thu, 7 Feb 2013 17:30:52 -0500
Subject: [PATCH] Move the bitfield test to tests/lib/
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 .gitignore                      | 2 +-
 tests/Makefile.am               | 4 ----
 tests/lib/Makefile.am           | 3 ++-
 tests/lib/runall.sh             | 5 ++++-
 tests/{ => lib}/test-bitfield.c | 0
 tests/runall.sh                 | 7 -------
 6 files changed, 7 insertions(+), 14 deletions(-)
 rename tests/{ => lib}/test-bitfield.c (100%)

diff --git a/.gitignore b/.gitignore
index 03443dfc..752308e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/tests/test-bitfield
+/tests/lib/test-bitfield
 /tests/lib/test-seeks
 *.o
 *.a
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 47891e90..816fa660 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,10 +2,6 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
 
 SUBDIRS = lib
 
-noinst_PROGRAMS = test-bitfield
-
-test_bitfield_SOURCES = test-bitfield.c
-
 EXTRA_DIST = runall.sh ctf-traces/**
 
 check-am:
diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index e9e264bb..0613bebd 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -8,9 +8,10 @@ test_seeks_LDADD = libtestcommon.a \
 	$(top_builddir)/lib/libbabeltrace.la \
 	$(top_builddir)/formats/ctf/libbabeltrace-ctf.la
 
-noinst_PROGRAMS = test-seeks
+noinst_PROGRAMS = test-seeks test-bitfield
 
 test_seeks_SOURCES = test-seeks.c
+test_bitfield_SOURCES = test-bitfield.c
 
 EXTRA_DIST = README.tap runall.sh
 
diff --git a/tests/lib/runall.sh b/tests/lib/runall.sh
index 34503bbb..b5522ad0 100755
--- a/tests/lib/runall.sh
+++ b/tests/lib/runall.sh
@@ -3,4 +3,7 @@
 # With a trace than contains empty packets
 ./test-seeks ../ctf-traces/succeed/wk-heartbeat-u/ 1351532897586558519 1351532897591331194
 # With a bigger trace
-./test-seeks ../ctf-traces/succeed/lttng-modules-2.0-pre5/ 61334174524234 61336381998396
\ No newline at end of file
+./test-seeks ../ctf-traces/succeed/lttng-modules-2.0-pre5/ 61334174524234 61336381998396
+
+# run bitfield tests
+./test-bitfield
diff --git a/tests/test-bitfield.c b/tests/lib/test-bitfield.c
similarity index 100%
rename from tests/test-bitfield.c
rename to tests/lib/test-bitfield.c
diff --git a/tests/runall.sh b/tests/runall.sh
index b2af6564..9e0bdca5 100755
--- a/tests/runall.sh
+++ b/tests/runall.sh
@@ -53,13 +53,6 @@ function run_babeltrace ()
 	return $?
 }
 
-echo -e "Running test-bitfield..."
-./test-bitfield
-test_check
-if [ $? -ne 0 ]; then
-	exit 1
-fi
-
 #run babeltrace expects success
 echo -e "Running babeltrace without argument..."
 run_babeltrace
-- 
2.34.1