From 3621e02b625dcbeb40b79a224325d691702e90a7 Mon Sep 17 00:00:00 2001
From: Enol Fernandez <enolfc@ifca.unican.es>
Date: Thu, 26 Sep 2013 11:26:23 +0200
Subject: [PATCH] Added support for detecting darwin os features.
---
src/mpi-start.in | 6 +++++-
tests/test_issue_6.sh | 18 +++++++++++++++++-
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/mpi-start.in b/src/mpi-start.in
index 3212d72..272ab1d 100755
--- a/src/mpi-start.in
+++ b/src/mpi-start.in
@@ -492,8 +492,12 @@ mpi_start_detect_os() {
export MPI_START_OS_DIST_TYPE="el"
fi
export MPI_START_OS_RELEASE=`lsb_release -sr 2> /dev/null`
- export MPI_START_OS_RELEASE_MAJOR=`echo $MPI_START_OS_RELEASE | cut -f1 -d"."`
+ export MPI_START_OS_RELEASE_MAJOR=`echo "$MPI_START_OS_RELEASE" | cut -f1 -d"."`
fi
+ elif test "x${MPI_START_UNAME}" = "xdarwin" ; then
+ export MPI_START_OS_DIST_TYPE=`uname -s`
+ export MPI_START_OS_RELEASE=`uname -r`
+ export MPI_START_OS_RELEASE_MAJOR=`echo "$MPI_START_OS_RELEASE" | cut -f1 -d"."`
fi
}
diff --git a/tests/test_issue_6.sh b/tests/test_issue_6.sh
index 1dfb075..e63ec09 100755
--- a/tests/test_issue_6.sh
+++ b/tests/test_issue_6.sh
@@ -12,6 +12,7 @@ oneTimeSetUp () {
setUp() {
export MPI_START_ETC_LIST=`$MYMKTEMP -d`
export MPI_LOADED=0
+ export MPI_LOADED_2=0
}
tearDown() {
@@ -28,36 +29,46 @@ oneTimeTearDown () {
testConfigDistReleaseArch() {
echo "export MPI_LOADED=1" > $MPI_START_ETC_LIST/mpi-config.${MPI_START_OS_DIST_TYPE}${MPI_START_OS_RELEASE_MAJOR}-${MPI_START_ARCH}
assertEquals "0" "$MPI_LOADED"
+ assertEquals "0" "$MPI_LOADED_2"
mpi_start_load_mpi_config
assertEquals "1" "$MPI_LOADED"
+ assertEquals "0" "$MPI_LOADED_2"
}
testConfigDistRelease() {
echo "export MPI_LOADED=1" > $MPI_START_ETC_LIST/mpi-config.${MPI_START_OS_DIST_TYPE}${MPI_START_OS_RELEASE_MAJOR}
assertEquals "0" "$MPI_LOADED"
+ assertEquals "0" "$MPI_LOADED_2"
mpi_start_load_mpi_config
assertEquals "1" "$MPI_LOADED"
+ assertEquals "0" "$MPI_LOADED_2"
}
testConfigDist() {
echo "export MPI_LOADED=1" > $MPI_START_ETC_LIST/mpi-config.${MPI_START_OS_DIST_TYPE}
assertEquals "0" "$MPI_LOADED"
+ assertEquals "0" "$MPI_LOADED_2"
mpi_start_load_mpi_config
assertEquals "1" "$MPI_LOADED"
+ assertEquals "0" "$MPI_LOADED_2"
}
testConfigUname() {
echo "export MPI_LOADED=1" > $MPI_START_ETC_LIST/mpi-config.${MPI_START_UNAME}
assertEquals "0" "$MPI_LOADED"
+ assertEquals "0" "$MPI_LOADED_2"
mpi_start_load_mpi_config
assertEquals "1" "$MPI_LOADED"
+ assertEquals "0" "$MPI_LOADED_2"
}
testConfigLocal() {
echo "export MPI_LOADED=1" > $MPI_START_ETC_LIST/mpi-config.local
assertEquals "0" "$MPI_LOADED"
+ assertEquals "0" "$MPI_LOADED_2"
mpi_start_load_mpi_config
assertEquals "1" "$MPI_LOADED"
+ assertEquals "0" "$MPI_LOADED_2"
}
testConfigOrderDistReleaseArch() {
@@ -67,6 +78,7 @@ testConfigOrderDistReleaseArch() {
echo "export MPI_LOADED_2=3" > $MPI_START_ETC_LIST/mpi-config.${MPI_START_OS_DIST_TYPE}
echo "export MPI_LOADED_2=4" > $MPI_START_ETC_LIST/mpi-config.${MPI_START_UNAME}
assertEquals "0" "$MPI_LOADED"
+ assertEquals "0" "$MPI_LOADED_2"
mpi_start_load_mpi_config
assertEquals "1" "$MPI_LOADED"
assertEquals "1" "$MPI_LOADED_2"
@@ -78,6 +90,7 @@ testConfigOrderDistRelease() {
echo "export MPI_LOADED_2=3" > $MPI_START_ETC_LIST/mpi-config.${MPI_START_OS_DIST_TYPE}
echo "export MPI_LOADED_2=4" > $MPI_START_ETC_LIST/mpi-config.${MPI_START_UNAME}
assertEquals "0" "$MPI_LOADED"
+ assertEquals "0" "$MPI_LOADED_2"
mpi_start_load_mpi_config
assertEquals "1" "$MPI_LOADED"
assertEquals "2" "$MPI_LOADED_2"
@@ -85,9 +98,11 @@ testConfigOrderDistRelease() {
testConfigOrderDist() {
echo "export MPI_LOADED=1" > $MPI_START_ETC_LIST/mpi-config.local
- echo "export MPI_LOADED_2=3" > $MPI_START_ETC_LIST/mpi-config.${MPI_START_OS_DIST_TYPE}
+ # darwin is not case sensitive for file names!!!!
echo "export MPI_LOADED_2=4" > $MPI_START_ETC_LIST/mpi-config.${MPI_START_UNAME}
+ echo "export MPI_LOADED_2=3" > $MPI_START_ETC_LIST/mpi-config.${MPI_START_OS_DIST_TYPE}
assertEquals "0" "$MPI_LOADED"
+ assertEquals "0" "$MPI_LOADED_2"
mpi_start_load_mpi_config
assertEquals "1" "$MPI_LOADED"
assertEquals "3" "$MPI_LOADED_2"
@@ -97,6 +112,7 @@ testConfigOrderUname() {
echo "export MPI_LOADED=1" > $MPI_START_ETC_LIST/mpi-config.local
echo "export MPI_LOADED_2=4" > $MPI_START_ETC_LIST/mpi-config.${MPI_START_UNAME}
assertEquals "0" "$MPI_LOADED"
+ assertEquals "0" "$MPI_LOADED_2"
mpi_start_load_mpi_config
assertEquals "1" "$MPI_LOADED"
assertEquals "4" "$MPI_LOADED_2"
--
GitLab