Fixes in codegen and test script

test/test.sh

 #!/bin/bash
 set -e # bail on error
 
 function fail {
   echo -e "Some tests failed"
   return 1
 }
 
 # Arguments passed to the diff tool. We exclude:
 #  - *.map files so they aren't compared, as the diff is not human readable.
 #  - runtime JS files that are just copied over from the sources and are not
 #    duplicated in the expected folder.
 DIFF_ARGS="-u -r -N --exclude=\*.map \
   --exclude=dart_runtime.js \
   --exclude=dart_core.js \
   --exclude=harmony_feature_check.js \
   --exclude=messages_widget.js \
   --exclude=messages.css \
   expect actual"
 
 function show_diff {
   echo "Fail: actual output did not match expected"
   echo
   diff $DIFF_ARGS |\
     sed -e "s/^\(+.*\)/\1/" |\
     sed -e "s/^\(-.*\)/\1/"
   echo
   echo "You can update these expectations with:"
-  echo "$ pushd `pwd` && cp -a actual/* expect && popd"
+  echo "$ cp -a test/codegen/actual/* test/codegen/expect"

[Jennifer Messerly, 2015/03/11 23:48:00]

This doesn't work if you're standing in a folder besides root. This script is
meant to work from anywhere, hence changed on purpose in a past revision to use
`pwd`. I'm fine with interpolating the `pwd` here if you want to avoid
pushd/popd.

[Siggi Cherem (dart-lang), 2015/03/12 00:16:26]

Ah, I see, never mind, I somehow missed that. reverted

   fail
 }
 
 # the directory of this script
 TEST_DIR=$( cd $( dirname "${BASH_SOURCE[0]}" ) && pwd )
 
 # Some tests require being run from the package root
 cd $TEST_DIR/..
 
 # Check minimum SDK version
@@ skipping 40 matching lines @@
 #   * local files that have never been added to git,
 #   * subdirectories of test/ and tool/, unless explicitly added. Those dirs
 #     contain a lot of generated or external source we should not reformat.
 (files=`git ls-files 'bin/*.dart' 'lib/*.dart' test/*.dart test/checker/*.dart \
   tool/*.dart | grep -v lib/src/js/`; git status -s $files | grep -q . \
   && echo "Did not run the formatter, please commit edited files first." \
   || (echo "Running dart formatter" ; pub run dart_style:format -w $files))
 popd &> /dev/null
 
 echo -e "All tests pass"