From 48cbd790d018205d52a672ac1d9a40c5720903dc Mon Sep 17 00:00:00 2001
From: David Ozog <david.m.ozog@intel.com>
Date: Wed, 7 Feb 2024 19:25:38 -0500
Subject: [PATCH] tests-sos: remove copy, point directly to module

---
 Makefile.am         |  2 +-
 autogen.sh          | 15 ---------------
 configure.ac        | 20 +++++++++++---------
 modules/Makefile.am | 14 ++++++++++++++
 4 files changed, 26 insertions(+), 25 deletions(-)
 create mode 100644 modules/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5d152d51..ec4a407f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
diff --git a/autogen.sh b/autogen.sh
index bd59137d..4235694e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -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
diff --git a/configure.ac b/configure.ac
index 39197dda..bd55391a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -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
 
diff --git a/modules/Makefile.am b/modules/Makefile.am
new file mode 100644
index 00000000..08c10537
--- /dev/null
+++ b/modules/Makefile.am
@@ -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