# HG changeset patch
# User Jon Chatten
# Date 1270026626 -3600
# Node ID 7c1061e3ab43b7cfc26b36d793402a02d4eae6bd
# Parent  f73eee123484b323bea9eda98b20f06b3ad196a8# Parent  48d025ecec3c84879fa2fbea5a5b67a9390fb329
merge from fix

diff -r f73eee123484 -r 7c1061e3ab43 sbsv2/raptor/test/smoke_suite/cli_makevar_override.py
--- a/sbsv2/raptor/test/smoke_suite/cli_makevar_override.py	Tue Mar 30 18:47:38 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/cli_makevar_override.py	Wed Mar 31 10:10:26 2010 +0100
@@ -15,25 +15,24 @@
 #
 
 # Checks that functionality for overriding makefile varaibles at the command no longer works
-
+# The mechanism for dealing with this was removed as the fix for SF bug 2134
+# On the CLI, "something=something" is now treated as a target rather than a variable assignment
 
 from raptor_tests import SmokeTest
 
 def run():
 	t = SmokeTest()
 	t.name = "cli_makevar_overide"
+	t.id = "0117"
 	t.description = "Attempt to override a makefile var at the command line."
 	t.usebash = True
 	
-	bldinf = "smoke_suite/test_resources/basics/helloworld/Bld.inf"
-	cmd1 = "sbs -b %s REALLYCLEAN -m ${SBSMAKEFILE} -f ${SBSLOGFILE} HOSTPLATFORM_DIR=unlikelydir" % bldinf
-	cmd2 = "grep -i 'unlikelydir' ${SBSMAKEFILE}"
-	t.command = cmd1 + " && " + cmd2
-
-	t.mustmatch_singleline = ["2"]
+	t.command = "sbs -b smoke_suite/test_resources/basics/helloworld/Bld.inf REALLYCLEAN -m ${SBSMAKEFILE} -f ${SBSLOGFILE} HOSTPLATFORM_DIR=unlikelydir"  
+	
+	t.mustmatch = ["sbs: warning: CLEAN, CLEANEXPORT and a REALLYCLEAN should not be combined with other targets as the result is unpredictable"]
 	
 	t.warnings = 1
-	t.returncode = 2
 	t.run()
+	
 	return t
 	
\ No newline at end of file