[PATCHv2] perftest: Make rdma_lat and rdma_bw executable names rdma neutral

Commit Message

Hal Rosenstock Oct. 4, 2009, 4:11 p.m. UTC

None

Patch

diff --git a/Makefile b/Makefile
index 8042531..bda56d4 100755
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@ 
-TESTS = write_bw_postlist rdma_lat rdma_bw send_lat send_bw write_lat write_bw read_lat read_bw
+RDMACM_TESTS = rdma_lat rdma_bw
+TESTS = write_bw_postlist send_lat send_bw write_lat write_bw read_lat read_bw
 UTILS = clock_test
 
-all: ${TESTS} ${UTILS}
+all: ${RDMACM_TESTS} ${TESTS} ${UTILS}
 
 CFLAGS += -Wall -g -D_GNU_SOURCE -O2
 EXTRA_FILES = get_clock.c
@@ -10,11 +11,16 @@  EXTRA_HEADERS = get_clock.h
 LOADLIBES += 
 LDFLAGS +=
 
-${TESTS}: LOADLIBES += -libverbs -lrdmacm
+${RDMACM_TESTS}: LOADLIBES += -libverbs -lrdmacm
+${TESTS} ${UTILS}: LOADLIBES += -libverbs
 
+${RDMACM_TESTS}: %: %.c ${EXTRA_FILES} ${EXTRA_HEADERS}
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< ${EXTRA_FILES} $(LOADLIBES) $(LDLIBS) -o $@
 ${TESTS} ${UTILS}: %: %.c ${EXTRA_FILES} ${EXTRA_HEADERS}
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< ${EXTRA_FILES} $(LOADLIBES) $(LDLIBS) -o ib_$@
+
 clean:
+	$(foreach fname,${RDMACM_TESTS}, rm -f ${fname})
 	$(foreach fname,${TESTS} ${UTILS}, rm -f ib_${fname})
 .DELETE_ON_ERROR:
 .PHONY: all clean
diff --git a/perftest.spec b/perftest.spec
index bd234e1..c6d18fe 100755
--- a/perftest.spec
+++ b/perftest.spec
@@ -23,8 +23,8 @@  export CFLAGS="$RPM_OPT_FLAGS"
 chmod -x runme
 
 %install
-install -D -m 0755 ib_rdma_lat $RPM_BUILD_ROOT%{_bindir}/ib_rdma_lat
-install -D -m 0755 ib_rdma_bw $RPM_BUILD_ROOT%{_bindir}/ib_rdma_bw
+install -D -m 0755 rdma_lat $RPM_BUILD_ROOT%{_bindir}/rdma_lat
+install -D -m 0755 rdma_bw $RPM_BUILD_ROOT%{_bindir}/rdma_bw
 install -D -m 0755 ib_write_lat $RPM_BUILD_ROOT%{_bindir}/ib_write_lat
 install -D -m 0755 ib_write_bw $RPM_BUILD_ROOT%{_bindir}/ib_write_bw
 install -D -m 0755 ib_send_lat $RPM_BUILD_ROOT%{_bindir}/ib_send_lat
@@ -43,6 +43,8 @@  rm -rf ${RPM_BUILD_ROOT}
 %_bindir/*
 
 %changelog
+* Sat Apr 18 2009 - [e-mail]
+- Change executable names for rdma_lat and rdma_bw
 * Mon Jul 09 2007 - [e-mail]
 - Use correct version
 * Wed Jul 04 2007 - [e-mail]