diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2016-07-05 20:56:13 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2016-07-05 20:56:13 +0300 |
| commit | 467c30b16b680d288729880f031fe3e55c3951a0 (patch) | |
| tree | a0dbe1c7a56738501365cf0f1188d60a45b4d539 | |
| parent | b44acc16e0378a5db0354ac2563e1e59d4cf1b2d (diff) | |
Start of migration of deprecated profile options
| -rw-r--r-- | include/profiles | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/include/profiles b/include/profiles index 1d1cf442..e0eac7a9 100644 --- a/include/profiles +++ b/include/profiles @@ -243,12 +243,6 @@ SKIP_TESTS="${SKIP_TESTS} ${STRING}" ;; - # Tests to always skip (useful for false positives or problematic tests) - test_skip_always) - TEST_SKIP_ALWAYS="${VALUE}" - LogText "Tests to be skipped: ${VALUE}" - ;; - # Do not check the latest version on the internet skip_upgrade_test | skip-upgrade-test) FIND=`echo "${VALUE}" | egrep "^(1|true|yes)"` && SKIP_UPGRADE_TEST=1 @@ -261,6 +255,7 @@ if [ "${VALUE}" = "light" ]; then SCAN_TEST_LIGHT="YES"; SCAN_TEST_MEDIUM="NO"; SCAN_TEST_HEAVY="NO"; fi if [ "${VALUE}" = "normal" ]; then SCAN_TEST_LIGHT="YES"; SCAN_TEST_MEDIUM="YES"; SCAN_TEST_HEAVY="NO"; fi if [ "${VALUE}" = "full" ]; then SCAN_TEST_LIGHT="YES"; SCAN_TEST_MEDIUM="YES"; SCAN_TEST_HEAVY="YES"; fi + AddSetting "test-scan-mode" "${VALUE}" "Scan mode" ;; # Server IP or hostname @@ -326,7 +321,7 @@ ;; # Receiving system (IP address or hostname) - upload_server | upload-server) + upload-server) UPLOAD_SERVER="${VALUE}" AddSetting "upload-server" "${UPLOAD_SERVER}" "Upload server (ip or hostname)" ;; @@ -350,6 +345,26 @@ AddSetting "verbose" "${VERBOSE}" "Verbose output" ;; + ######################################################################################################## + ## DEPRECATED ITEMS + ######################################################################################################## + + # Deprecated: skip tests + test_skip_always) + STRING=`echo ${VALUE} | tr '[:upper:]' '[:lower:]'` + SKIP_TESTS="${SKIP_TESTS} ${STRING}" + LogText "[deprecated option] Tests to be skipped: ${VALUE}" + DisplayToolTip "Replace deprecated option 'test_skip_always' and replace with 'skip-test' (add to custom.prf)" + ;; + + # Deprecated: receiving system (IP address or hostname) + upload_server) + UPLOAD_SERVER="${VALUE}" + AddSetting "upload-server" "${UPLOAD_SERVER}" "Upload server (ip or hostname)" + DisplayToolTip "Replace deprecated option 'upload_server' and replace with 'upload-server' (add to custom.prf)" + ;; + + # Catch all bad options and bail out *) LogText "Unknown option ${OPTION} (with value: ${VALUE})" |