Merge 3.16 (after 3.16.2-rc1) into 7.0

modules/libcom/test/macLibTest.c

@@ -65,11 +65,11 @@ static void ovcheck(void)
 
 MAIN(macLibTest)
 {
-    testPlan(91);
+    testPlan(93);
 
     if (macCreateHandle(&h, NULL))
         testAbort("macCreateHandle() failed");
-    macSuppressWarning(h, TRUE);
+    eltc(0);
 
     check("FOO", " FOO");
 
@@ -215,6 +215,10 @@ MAIN(macLibTest)
     check("${FOO,FOO=${FOO}}", "!$(FOO,recursive)");
     check("${FOO=GRIBBLE,FOO=${FOO}}", "!$(FOO,recursive)");
 
+    macSuppressWarning(h, TRUE);
+    check("$(CRUX)", "!$(CRUX)");
+    check("${FOO}", "!$(BAR)");
+
     ovcheck();
 
     return testDone();