Updating build-and-test script and e2e tests to reflect new build directory layout

Scripts/build-and-test

@@ -187,7 +187,9 @@ if [[ $BUILD == 1 ]]; then
             fi
             make -C $BUILD_DIR -j -f $MAKEFILE 1>&6 2>&7 || exit $?
         fi
-        chmod a+r $BUILD_FILE.*
+        if [[ $QUIET_BUILD == 1 ]]; then
+          chmod a+r $BUILD_FILE.*
+        fi
     done
 fi
 
@@ -215,18 +217,21 @@ if [[ $RUN == 1 ]]; then
             fi
             OUT_FILE="$RUN_FILE.$FLAVOR.$TARGET.out"
 
-            if ! [[ -f "./$FLAVOR_DIR/$BIN_NAME" ]]; then
+            BIN_PATH=$CNTK_ROOT/$FLAVOR_DIR/$BIN_NAME 
+            if ! [[ -f $BIN_PATH ]]; then
                 echo "============ ERROR: CNTK did not build properly for flavor ($FLAVOR)  ============"
+                echo "Missing file: $BIN_PATH"
                 exit 1
             fi
 
             echo "============ Running CNTK for ($FLAVOR) ($TARGET), output in ($RUN_FILE.*) ============"
+            cd $CNTK_ROOT/Demos
             rm -rf models
             if [[ $OS == "Windows_NT" ]]; then
                 # We have to use cygpath on Windows to modify the file paths into the format readable by cntk.
-                time ./$FLAVOR_DIR/$BIN_NAME configFile="`cygpath -w $CONF_FILE`" &>$OUT_FILE || exit $?
+                time $BIN_PATH configFile="`cygpath -w $CONF_FILE`" &>$OUT_FILE || exit $?
             else
-                time ./$FLAVOR_DIR/$BIN_NAME configFile=$CONF_FILE &>$OUT_FILE || exit $?
+                time $BIN_PATH configFile=$CONF_FILE &>$OUT_FILE || exit $?
             fi
             chmod a+r $RUN_FILE.*
 

Tests/Speech/QuickE2E/run-test

@@ -1,5 +1,5 @@
 #!/bin/bash
-CNTK_BINARY=$TEST_BUILD_LOCATION/x86_64.gpu.$TEST_FLAVOR.acml/cntk
+CNTK_BINARY=$TEST_BUILD_LOCATION/$TEST_FLAVOR/bin/cntk
 if [ "$TEST_DEVICE" == "CPU" ]; then
    CNTK_DEVICE_ID=-1
 else

Tests/TestDriver.py

@@ -522,7 +522,7 @@ runSubparser.add_argument("test", nargs="*",
                          "Use list command to list available tests. "
                          "If not specified then all tests will be run.")
 #TODO: port paths to Windows
-defaultBuildLocation=os.path.realpath(os.path.join(thisDir, "..", "bin"))
+defaultBuildLocation=os.path.realpath(os.path.join(thisDir, "..", "build"))
 runSubparser.add_argument("-b", "--build-location", default=defaultBuildLocation, help="location of the CNTK build to run")
 runSubparser.add_argument("-d", "--device", help="cpu|gpu - run on a specific device")
 runSubparser.add_argument("-f", "--flavor", help="release|debug - run only a specific flavor")