Changeset 13784 for utils/CI

Timestamp:

2020-11-12T10:29:29+01:00 (3 years ago)

Author:

gsamson

Message:

correctly handle add/del cpp keys with sette; tiket #2569

Location:

utils/CI/sette

Files:

• sette_reference-configurations.sh (modified) (1 diff)
• sette_test-cases.sh (modified) (1 diff)

utils/CI/sette/sette_reference-configurations.sh

@@ -104 +104 @@
 export USING_EXTRA_HALO="no"
 #
-export DEL_KEYS="key_iomput"
+export ADD_KEYS=""
+export DEL_KEYS=""
 if [ ${USING_XIOS} == "yes" ] 
  then 
-   export DEL_KEYS=""
-fi
-#
-export ADD_KEYS=""
+   export ADD_KEYS="${ADD_KEYS} key_iomput"
+ else
+   export DEL_KEYS="${DEL_KEYS} key_iomput"
+fi
+#
 if [ ${ADD_NOSIGNEDZERO} == "yes" ]
  then
-   export ADD_KEYS="key_nosignedzero"
+   export ADD_KEYS="${ADD_KEYS} key_nosignedzero"
+ else
+   export DEL_KEYS="${DEL_KEYS} key_nosignedzero" 
 fi
 #

utils/CI/sette/sette_test-cases.sh

@@ -104 +104 @@
 export MPIRUN_FLAG="yes"
 #
-export DEL_KEYS="key_iomput"
+export ADD_KEYS=""
+export DEL_KEYS=""
 if [ ${USING_XIOS} == "yes" ] 
  then 
-   export DEL_KEYS=""
-fi
-#
-export ADD_KEYS=""
+   export ADD_KEYS="${ADD_KEYS} key_iomput"
+ else
+   export DEL_KEYS="${DEL_KEYS} key_iomput"
+fi
+#
 if [ ${ADD_NOSIGNEDZERO} == "yes" ]
  then
-   export ADD_KEYS="key_nosignedzero"
+   export ADD_KEYS="${ADD_KEYS} key_nosignedzero"
+ else
+   export DEL_KEYS="${DEL_KEYS} key_nosignedzero" 
 fi
 #