Add test-sos as a submodule

.github/workflows/ci.yml

@@ -151,7 +151,9 @@ jobs:
       - name: Checking OS version
         run: |
           echo "OS_NAME=$(lsb_release -si)-$(ls_release -sr)" >> $GITHUB_ENV
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'true'
       - name: Install dependencies
         run: |
           sudo apt-get install -y gfortran rpm mpich libmpich-dev libhwloc-dev
@@ -167,7 +169,7 @@ jobs:
           key: libfabric-${{ matrix.libfabric_version }}-${{ env.OS_NAME }}
       - name: Checkout libfabric
         if: steps.cache-libfabric.outputs.cache-hit != 'true'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: ofiwg/libfabric
           path: repos/libfabric
@@ -192,7 +194,7 @@ jobs:
           key: xpmem-${{ matrix.xpmem_version }}-${{ env.OS_NAME }}
       - name: Checkout XPMEM
         if: ${{ matrix.xpmem_version }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: hjelmn/xpmem
           path: repos/xpmem
@@ -232,6 +234,8 @@ jobs:
           #make dist
           #rpmbuild -ta ./sandia-openshmem-*.tar.gz --define "configargs --with-ofi=${LIBFABRIC_INSTALL_DIR} ${{ matrix.sos_config }}" --define "_prefix /usr/shmem"
           #make clean
+          rm test
+          cp -r modules/tests-sos/test test
           ./configure --with-ofi=${LIBFABRIC_INSTALL_DIR} ${{ matrix.sos_config }}
           make dist
           rpmbuild -ta ./sandia-openshmem-*.tar.gz --define "configargs --with-ofi=${LIBFABRIC_INSTALL_DIR} ${{ matrix.sos_config }}"
@@ -483,7 +487,9 @@ jobs:
       - name: Checking OS version
         run: |
           echo "OS_NAME=$(lsb_release -si)-$(ls_release -sr)" >> $GITHUB_ENV
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'true'
       - name: Install dependencies
         run: |
           sudo apt-get install -y gfortran mpich libmpich-dev
@@ -492,7 +498,7 @@ jobs:
 
       # XPMEM
       - name: Checkout XPMEM
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: hjelmn/xpmem
           path: repos/xpmem
@@ -517,7 +523,7 @@ jobs:
           key: ucx-${{ matrix.ucx_version}}-${{ env.OS_NAME }}
       - name: Checkout UCX
         if: steps.cache-ucx.outputs.cache-hit != 'true'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: openucx/ucx
           path: repos/ucx
@@ -573,7 +579,9 @@ jobs:
       - name: Checking OS version
         run: |
           echo "OS_NAME=$(lsb_release -si)-$(ls_release -sr)" >> $GITHUB_ENV
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'true'
       - name: Install dependencies
         run: |
           sudo apt-get install -y gfortran mpich libmpich-dev libev-dev libev-libevent-dev
@@ -582,7 +590,7 @@ jobs:
 
       # XPMEM
       - name: Checkout XPMEM
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: hjelmn/xpmem
           path: repos/xpmem
@@ -607,7 +615,7 @@ jobs:
           key: portals4-${{ matrix.portals4_version}}-${{ env.OS_NAME }}
       - name: Checkout Portals4
         if: steps.cache-portals4.outputs.cache-hit != 'true'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: regrant/portals4
           path: repos/portals4
@@ -650,7 +658,9 @@ jobs:
       - name: Checking OS version
         run: |
           echo "OS_NAME=$(lsb_release -si)-$(ls_release -sr)" >> $GITHUB_ENV
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'true'
       - name: Install dependencies
         run: |
           sudo apt-get install -y gfortran mpich libmpich-dev libev-dev libev-libevent-dev
@@ -659,7 +669,7 @@ jobs:
 
       # XPMEM
       - name: Checkout XPMEM
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: hjelmn/xpmem
           path: repos/xpmem

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "modules/tests-sos"]
+	path = modules/tests-sos
+	url = [email protected]:openshmem-org/tests-sos.git
+	branch = main

autogen.sh

@@ -2,6 +2,14 @@
 
 test -d ./config || mkdir ./config
 
+if [ ! -f test/Makefile.am ] || [ ! -f test/apps/Makefile.am ] ||
+   [ ! -f test/include/Makefile.am ] || [ ! -f test/performance/Makefile.am ] ||
+   [ ! -f test/shmemx/Makefile.am ]  || [ ! -f test/spec-example/Makefile.am ] ||
+   [ ! -f test/unit/Makefile.am ];
+then
+  test -f modules/tests-sos/autogen.sh || { echo "ERROR: The test directory is empty. Please run the following command to download the SOS tests:"; echo "git submodule update --init"; exit 1; }
+fi
+
 FILES=./man/*.1
 echo -n "dist_man1_MANS =" > ./man/Makefile.am
 for f in $FILES

scripts/docker/Dockerfile

@@ -97,7 +97,7 @@ RUN make install
 
 # Build SOS
 WORKDIR $SOS_INSTALL
-RUN git clone https://github.com/Sandia-OpenSHMEM/SOS.git
+RUN git clone --recurse-submodules https://github.com/Sandia-OpenSHMEM/SOS.git
 WORKDIR SOS
 RUN ./autogen.sh
 # To build SOS w/ basic Libfabric

scripts/simple-build-ofi.sh

@@ -82,7 +82,7 @@ echo ========================================================================
 echo = BUILDING SANDIA OPENSHMEM
 echo ========================================================================
 
-git clone -b $SOS_VERSION --depth $CLONE_DEPTH https://github.com/Sandia-OpenSHMEM/SOS.git sos
+git clone -b $SOS_VERSION --depth $CLONE_DEPTH --recurse-submodules https://github.com/Sandia-OpenSHMEM/SOS.git sos
 cd sos
 ./autogen.sh
 ./configure --prefix=$INSTALL_DIR --with-ofi=$INSTALL_DIR $SOS_CONFIG_OPTS

test

@@ -0,0 +1 @@
+modules/tests-sos/test/