From mboxrd@z Thu Jan  1 00:00:00 1970
From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Date: Tue, 30 Jun 2015 15:18:24 +0000 (UTC)
Subject: [lttng-dev] [PATCH urcu] Fix: make benchmark test run in oot
	build
In-Reply-To: <1435676655-16099-1-git-send-email-mjeanson@efficios.com>
References: <1435676655-16099-1-git-send-email-mjeanson@efficios.com>
Message-ID: <2061220050.1315.1435677504889.JavaMail.zimbra@efficios.com>

Merged into master and stable-0.8, thanks!

Mathieu

----- On Jun 30, 2015, at 11:04 AM, Michael Jeanson mjeanson at efficios.com wrote:

> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
> tests/benchmark/Makefile.am       | 32 ++++++++++++++++++++++++++++++--
> tests/benchmark/common.sh         |  0
> tests/benchmark/runpaul-phase5.sh |  0
> tests/benchmark/runpaul-phase6.sh |  0
> 4 files changed, 30 insertions(+), 2 deletions(-)
> mode change 100644 => 100755 tests/benchmark/common.sh
> mode change 100644 => 100755 tests/benchmark/runpaul-phase5.sh
> mode change 100644 => 100755 tests/benchmark/runpaul-phase6.sh
> 
> diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am
> index 85d454d..e25dd8f 100644
> --- a/tests/benchmark/Makefile.am
> +++ b/tests/benchmark/Makefile.am
> @@ -3,6 +3,22 @@ AM_LDFLAGS=-lpthread
> endif
> AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/tests/common -g
> 
> +SCRIPT_LIST = common.sh \
> +	runall.sh \
> +	runhash.sh \
> +	runtests.sh \
> +	runpaul-phase1.sh \
> +	runpaul-phase2.sh \
> +	runpaul-phase3.sh \
> +	runpaul-phase4.sh \
> +	runpaul-phase5.sh \
> +	runpaul-phase6.sh \
> +	runpaul-phase7.sh \
> +	runtests-batch.sh \
> +	subphase4.sh
> +
> +dist_noinst_SCRIPTS = $(SCRIPT_LIST)
> +
> noinst_PROGRAMS = test_urcu test_urcu_dynamic_link test_urcu_timing \
> 	test_urcu_signal test_urcu_signal_dynamic_link test_urcu_signal_timing \
>         test_rwlock_timing test_rwlock test_perthreadlock_timing \
> @@ -32,8 +48,6 @@ URCU_CDS_LIB=$(top_builddir)/liburcu-cds.la
> 
> DEBUG_YIELD_LIB=$(builddir)/../common/libdebug-yield.la
> 
> -EXTRA_DIST = *.sh
> -
> test_urcu_SOURCES = test_urcu.c
> test_urcu_LDADD = $(URCU_LIB)
> 
> @@ -194,6 +208,20 @@ test_urcu_hash_SOURCES = test_urcu_hash.c test_urcu_hash.h
> \
> test_urcu_hash_CFLAGS = -DRCU_QSBR $(AM_CFLAGS)
> test_urcu_hash_LDADD = $(URCU_QSBR_LIB) $(URCU_COMMON_LIB) $(URCU_CDS_LIB)
> 
> +all-local:
> +	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
> +		for script in $(SCRIPT_LIST); do \
> +			cp -f $(srcdir)/$$script $(builddir); \
> +		done; \
> +	fi
> +
> +clean-local:
> +	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
> +		for script in $(SCRIPT_LIST); do \
> +			rm -f $(builddir)/$$script; \
> +		done; \
> +	fi
> +
> .PHONY: bench
> 
> bench:
> diff --git a/tests/benchmark/common.sh b/tests/benchmark/common.sh
> old mode 100644
> new mode 100755
> diff --git a/tests/benchmark/runpaul-phase5.sh
> b/tests/benchmark/runpaul-phase5.sh
> old mode 100644
> new mode 100755
> diff --git a/tests/benchmark/runpaul-phase6.sh
> b/tests/benchmark/runpaul-phase6.sh
> old mode 100644
> new mode 100755
> --
> 1.9.1

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com