From 666f56e954e1287a723718c2125128b5a93fda3c Mon Sep 17 00:00:00 2001
From: Jim Garlick <garlick.jim@gmail.com>
Date: Tue, 13 Jun 2017 13:36:44 -0700
Subject: [PATCH] test/barrier: relocate tbarrier test

Relocate "tbarrier" from src/test to t/barrier, like all
the other sharness-drive C test programs.
---
 src/test/Makefile.am               | 3 +--
 t/Makefile.am                      | 8 +++++++-
 {src/test => t/barrier}/tbarrier.c | 0
 t/t1001-barrier-basic.t            | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)
 rename {src/test => t/barrier}/tbarrier.c (100%)

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 411af860d933..3c0ce2a0e92a 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -10,8 +10,7 @@ AM_CPPFLAGS = \
 	$(ZMQ_CFLAGS)
 
 check_PROGRAMS = \
-	tmunge \
-	tbarrier
+	tmunge
 
 noinst_SCRIPTS = \
 	soak.sh \
diff --git a/t/Makefile.am b/t/Makefile.am
index 1cb37986c812..a2ec89813d84 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -180,7 +180,8 @@ check_PROGRAMS = \
 	kvs/commitmerge \
 	kvs/basic \
 	module/basic \
-	request/treq
+	request/treq \
+	barrier/tbarrier
 
 check_LTLIBRARIES = \
 	module/parent.la \
@@ -349,6 +350,11 @@ module_child_la_LDFLAGS = $(fluxmod_ldflags) -module -rpath /nowher
 module_child_la_LIBADD = \
 	$(test_ldadd) $(LIBDL) $(LIBUTIL)
 
+barrier_tbarrier_SOURCES = barrier/tbarrier.c
+barrier_tbarrier_CPPFLAGS = $(test_cppflags)
+barrier_tbarrier_LDADD = \
+	$(test_ldadd) $(LIBDL) $(LIBUTIL)
+
 module_basic_SOURCES = module/basic.c
 module_basic_CPPFLAGS = $(test_cppflags)
 module_basic_LDADD = \
diff --git a/src/test/tbarrier.c b/t/barrier/tbarrier.c
similarity index 100%
rename from src/test/tbarrier.c
rename to t/barrier/tbarrier.c
diff --git a/t/t1001-barrier-basic.t b/t/t1001-barrier-basic.t
index ab242018c285..39c8f2911544 100755
--- a/t/t1001-barrier-basic.t
+++ b/t/t1001-barrier-basic.t
@@ -11,7 +11,7 @@ before other tests that depend on barriers.
 . `dirname $0`/sharness.sh
 SIZE=4
 test_under_flux ${SIZE} minimal
-tbarrier="${FLUX_BUILD_DIR}/src/test/tbarrier"
+tbarrier="${FLUX_BUILD_DIR}/t/barrier/tbarrier"
 test "$verbose" = "t" || tbarrier="${tbarrier} -q"
 
 test_expect_success 'barrier: load barrier module' '