fixing a macro name mismatch that was making our test case succeed for the...

fixing a macro name mismatch that was making our test case succeed for the wrong reason; plus a minor code change to the CPP side of the test which eases debugging efforts

llvm-svn: 150213