Merge branch 'pr/test-submodule' of github.com:kholland-intel/SOS int…

…o pr/test-submodule
davidozog · Nov 21, 2023 · 242921c · 242921c
2 parents 1c6ac62 + e938972
commit 242921c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -488,6 +488,8 @@ jobs:
         run: |
           echo "OS_NAME=$(lsb_release -si)-$(ls_release -sr)" >> $GITHUB_ENV
       - uses: actions/checkout@v4
+        with:
+          submodules: 'true'
       - name: Install dependencies
         run: |
           sudo apt-get install -y gfortran mpich libmpich-dev
@@ -578,6 +580,8 @@ jobs:
         run: |
           echo "OS_NAME=$(lsb_release -si)-$(ls_release -sr)" >> $GITHUB_ENV
       - 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
@@ -655,6 +659,8 @@ jobs:
         run: |
           echo "OS_NAME=$(lsb_release -si)-$(ls_release -sr)" >> $GITHUB_ENV
       - 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

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
-[submodule "modules/test-sos"]
-	path = modules/test-sos
+[submodule "modules/tests-sos"]
+	path = modules/tests-sos
 	url = [email protected]:openshmem-org/tests-sos.git
+	branch = main
diff --git a/autogen.sh b/autogen.sh
@@ -2,7 +2,7 @@
 
 test -d ./config || mkdir ./config
 
-test -f modules/test-sos/configure.ac || { echo -n "WARNING: The test directory is empty. Please run the following command to install the SOS tests:\ngit submodule update --init"; }
+test -f modules/tests-sos/configure.ac || { echo "ERROR: The test directory is empty. Please run the following command to download the SOS tests:"; echo "git submodule update --init"; exit 1; }
 
 FILES=./man/*.1
 echo -n "dist_man1_MANS =" > ./man/Makefile.am

diff --git a/modules/test-sos b/modules/test-sos
diff --git a/modules/tests-sos b/modules/tests-sos
diff --git a/test b/test
@@ -1 +1 @@
-modules/test-sos/test/
+modules/tests-sos/test/