param: Allow tests to silence deprecation warnings

This helps make output sensitive tests more reliable.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14460

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 7e9767590f973d2334fb726018c791488a266222..3d4033eb2a4f5866932a4a765736cdc80c6f9837 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -1864,8 +1864,15 @@ bool lpcfg_do_global_parameter(struct loadparm_context *lp_ctx,
        }
 
        if (parm_table[parmnum].flags & FLAG_DEPRECATED) {
-               DEBUG(1, ("WARNING: The \"%s\" option is deprecated\n",
-                         pszParmName));
+               char *suppress_env = getenv("SAMBA_DEPRECATED_SUPPRESS");
+               bool print_warning = (suppress_env == NULL
+                                     || suppress_env[0] == '\0');
+               if (print_warning) {
+                       DBG_WARNING("WARNING: The \"%s\" option "
+                                   "is deprecated\n",
+                                   pszParmName);
+
+               }
        }
 
        parm_ptr = lpcfg_parm_ptr(lp_ctx, NULL, &parm_table[parmnum]);
@@ -1897,8 +1904,15 @@ bool lpcfg_do_service_parameter(struct loadparm_context *lp_ctx,
        }
 
        if (parm_table[parmnum].flags & FLAG_DEPRECATED) {
-               DEBUG(1, ("WARNING: The \"%s\" option is deprecated\n",
-                         pszParmName));
+               char *suppress_env = getenv("SAMBA_DEPRECATED_SUPPRESS");
+               bool print_warning = (suppress_env == NULL
+                                     || suppress_env[0] == '\0');
+               if (print_warning) {
+                       DBG_WARNING("WARNING: The \"%s\" option "
+                                   "is deprecated\n",
+                                   pszParmName);
+
+               }
        }
 
        if (parm_table[parmnum].p_class == P_GLOBAL) {

diff --git a/selftest/knownfail.d/testparm b/selftest/knownfail.d/testparm
deleted file mode 100644 (file)
index c3adb52..0000000
--- a/selftest/knownfail.d/testparm
+++ /dev/null
@@ -1 +0,0 @@
-^samba3.blackbox.testparm.test_deprecated_warning_suppressed
\ No newline at end of file