Skip to content

Commit

Permalink
tests-sos: remove copy, point directly to module
Browse files Browse the repository at this point in the history
  • Loading branch information
davidozog committed Feb 8, 2024
1 parent cd9bbac commit 48cbd79
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ endif

dist_doc_DATA = README NEWS LICENSE

SUBDIRS = bindings mpp pmi-simple src test
SUBDIRS = bindings mpp pmi-simple src modules

if ENABLE_MANPAGES
SUBDIRS += man
Expand Down
15 changes: 0 additions & 15 deletions autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,6 @@ elif [ ! -f "${tests_sos_dir}/test/Makefile.am" ] ||
echo "Please run the following command to download the SOS tests:"
echo " git submodule update --init"
exit 1
else
if [ -d "$current_dir/test" ] && [ ! -z "$(ls -A "$current_dir/test")" ]; then
echo "The ./test directory already contains files."
read -p "Do you want to overwrite them? (y/n): " overwrite
if [ "$overwrite" != "y" ]; then
echo "Copying tests-sos submodule aborted. Continuing..."
fi
fi
cp -r "${tests_sos_dir}/test" "$current_dir"
if [ $? -eq 0 ]; then
echo "tests-sos submodule copied successfully."
else
echo "Error: tests-sos submodule copy failed."
exit 1;
fi
fi

FILES=./man/*.1
Expand Down
20 changes: 11 additions & 9 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -967,15 +967,17 @@ AC_CONFIG_FILES([Makefile
mpp/shmem-def.h
src/Makefile
src/sandia-openshmem.pc
test/Makefile
test/unit/Makefile
test/shmemx/Makefile
test/spec-example/Makefile
test/include/Makefile
test/performance/Makefile
test/performance/shmem_perf_suite/Makefile
test/performance/tests/Makefile
test/apps/Makefile])
modules/Makefile
modules/tests-sos/Makefile
modules/tests-sos/test/Makefile
modules/tests-sos/test/unit/Makefile
modules/tests-sos/test/shmemx/Makefile
modules/tests-sos/test/spec-example/Makefile
modules/tests-sos/test/include/Makefile
modules/tests-sos/test/performance/Makefile
modules/tests-sos/test/performance/shmem_perf_suite/Makefile
modules/tests-sos/test/performance/tests/Makefile
modules/tests-sos/test/apps/Makefile])

AC_OUTPUT

Expand Down
14 changes: 14 additions & 0 deletions modules/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# -*- Makefile -*-
#
# Copyright 2011 Sandia Corporation. Under the terms of Contract
# DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government
# retains certain rights in this software.
#
# Copyright (c) 2024 Intel Corporation. All rights reserved.
# This software is available to you under the BSD license.
#
# This file is part of the Sandia OpenSHMEM software package. For license
# information, see the LICENSE file in the top level directory of the
# distribution.

SUBDIRS = tests-sos

0 comments on commit 48cbd79

Please sign in to comment.