From 1db47476245e46cb80b6a2ece619f7bd13ec42ab Mon Sep 17 00:00:00 2001 From: Christian Geddes Date: Thu, 7 Feb 2019 10:36:11 -0600 Subject: [PATCH] Unset CONFIG_FILE env var if in standalone environment There was a bug where we were setting it to nothing rather than unsetting it, we think it might be causing other issues. Change-Id: I06df6e9ed9f84414a5ee8765b255574952b281e9 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/71530 Tested-by: Jenkins Server Reviewed-by: Matt Derksen Reviewed-by: William G. Hoffa Reviewed-by: Daniel M. Crowell --- src/build/citest/setup-env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/build/citest/setup-env b/src/build/citest/setup-env index 8eda7b8ed42..76fa642231d 100755 --- a/src/build/citest/setup-env +++ b/src/build/citest/setup-env @@ -37,15 +37,15 @@ echo "MACHINE IS $MACHINE" if [ "$CHIP" == "NIMBUS" ]; then export PNOR=nimbus.pnor - export CONFIG_FILE= + unset CONFIG_FILE elif [ "$CHIP" == "CUMULUS" ]; then export PNOR=cumulus.pnor - export CONFIG_FILE= + unset CONFIG_FILE elif [ "$CHIP" == "CUMULUS_CDIMM" ]; then export PNOR=cumulus_cdimm.pnor - export CONFIG_FILE= + unset CONFIG_FILE elif [ "$CHIP" == "FSPBUILD" ]; then export PNOR=ZZ.pnor