Skip to content

Commit

Permalink
Merge pull request #656 from wrrobin/pr/test-rpm
Browse files Browse the repository at this point in the history
Header files for threaded perf tests and updated tarball name in spec
  • Loading branch information
wrrobin authored Mar 29, 2018
2 parents fa1ef38 + e67fc14 commit e55a71f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

ACLOCAL_AMFLAGS = -I config

EXTRA_DIST = README NEWS LICENSE sandia-openshmem.spec pmi-simple man
EXTRA_DIST = README NEWS LICENSE sandia-openshmem.spec autogen.sh pmi-simple man

SUBDIRS = bindings man mpp pmi-simple src test

Expand Down
6 changes: 5 additions & 1 deletion sandia-openshmem.spec.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%{!?configargs: %global configargs %{nil}}
%{!?testdir: %global testdir %{buildroot}%{_datadir}/%{name}-%{version}/tests}

Name: sandia-openshmem
Name: sos
Version: @VERSION@
Release: 1%{?dist}
Summary: Sandia OpenSHMEM.
Expand Down Expand Up @@ -47,6 +47,8 @@ rm -f %{buildroot}%{_libdir}/*.la
# Prepare tests
install -d %{testdir}/unit
install test/unit/.libs/* %{testdir}/unit
install -d %{testdir}/shmemx
install test/shmemx/.libs/* %{testdir}/shmemx
install -d %{testdir}/apps
install test/apps/.libs/* %{testdir}/apps
install -d %{testdir}/performance/shmem_perf_suite
Expand All @@ -64,13 +66,15 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%{_bindir}/oshrun
%{_libdir}/lib*.so.*
%{_libdir}/pkgconfig/*.pc
%doc LICENSE README NEWS

%files devel
%defattr(-,root,root)
%{_bindir}/*
%{_libdir}/lib*.so
%{_libdir}/*.a
%{_libdir}/pkgconfig/*.pc
%{_includedir}/*
%{_mandir}/man[1-3]/*

Expand Down
2 changes: 2 additions & 0 deletions test/performance/shmem_perf_suite/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ noinst_HEADERS = \
int_element_latency.h \
bw_common.h \
uni_dir.h \
uni_dir_ctx.h \
bi_dir.h \
bi_dir_ctx.h \
target_put.h

if ENABLE_LENGTHY_TESTS
Expand Down

0 comments on commit e55a71f

Please sign in to comment.