Rename non-debug to non-release

.azure-pipelines/scripts/build.sh

@@ -15,8 +15,8 @@ fi
 # Initialize the variables.
 if [[ "$build_mode" == "debug" ]]; then
     make_args="DEBUG=true"
-elif [[ "$build_mode" == "nondebug" ]]; then
-    make_args="DEBUG=false"
+elif [[ "$build_mode" == "nonrelease" ]]; then
+    make_args=""
 else
     echo "unknown build_mode: $build_mode"
     exit 1

.azure-pipelines/scripts/create_standalone_deb_pkg.sh

@@ -47,7 +47,7 @@ if [ -z $SGXLKL_PREFIX ]; then
 fi
 
 if [ -z $SGXLKL_BUILD_MODE ]; then
-    echo "ERROR: 'SGXLKL_BUILD_MODE' is undefined. Please export SGXLKL_BUILD_MODE=<debug|nondebug>"
+    echo "ERROR: 'SGXLKL_BUILD_MODE' is undefined. Please export SGXLKL_BUILD_MODE=<debug|nonrelease>"
     exit 1
 fi
 

.azure-pipelines/template.yml

@@ -9,7 +9,7 @@ parameters:
   # Names must not have dashes as job names cannot have them.
   # NOTE: When changing this list, also change install_prefix_mapping.
   - debug
-  - nondebug
+  - nonrelease
 - name: 'run_modes'
   type: object
   default:
@@ -32,7 +32,7 @@ parameters:
   type: object
   default:
     debug: /opt/sgx-lkl-debug
-    nondebug: /opt/sgx-lkl-nondebug
+    nonrelease: /opt/sgx-lkl-nonrelease
 - name: 'test_pool_mapping'
   type: object
   default:

tests/common.mk

@@ -19,8 +19,8 @@ else
 	ifeq (${SGXLKL_BUILD_MODE},)
 		ifeq (${SGXLKL_PREFIX},/opt/sgx-lkl-debug)
 			export SGXLKL_BUILD_MODE=debug
-		else ifeq (${SGXLKL_PREFIX},/opt/sgx-lkl-nondebug)
-			export SGXLKL_BUILD_MODE=nondebug
+		else ifeq (${SGXLKL_PREFIX},/opt/sgx-lkl-nonrelease)
+			export SGXLKL_BUILD_MODE=nonrelease
 		else
 			$(error SGXLKL_BUILD_MODE not set and SGXLKL_PREFIX is not a standard path)
 		endif

tests/ltp/run_ltp_test.sh

@@ -32,7 +32,7 @@ csv_filename="sgxlkl_oe_ltp_test_result_$(date +%d%m%y_%H%M%S).csv"
 echo "SI No, Test Name, Stdout logfile name, Stderr logfile name, Execution Status" > $csv_filename
 
 report_dir="report"
-# Delete all files except ltp-batch(debug).* or ltp-batch(nondebug).*
+# Delete all files except ltp-batch(debug).* or ltp-batch(nonrelease).*
 # Don't delete files that has paranthesis in file name
 # Deleting this file causes problem in the parent test_runner.sh script
 if [ -d $report_dir ]

tools/sgx-lkl-docker

@@ -28,7 +28,7 @@ function usage() {
     echo "    --name=<name>                                    Name of Docker image to be created."
     echo "    --host-cfg=<path>                                Path to host configuration file."
     echo "    --app-cfg=<path>                                 Path to app configuration file."
-    echo "    --mode=<debug|nondebug>                          Select the deployment mode of SGX-LKL (default: debug)"
+    echo "    --mode=<debug|nonrelease>                          Select the deployment mode of SGX-LKL (default: debug)"
     echo
     echo " [-?]                                                Display this help message."
     exit 1