Merge change 8340 into donut

[android-x86/build.git] / tools / check_builds.sh

diff --git a/tools/check_builds.sh b/tools/check_builds.sh
old mode 100755 (executable)
new mode 100644 (file)
index 14dfec6..fd380dd
--- a/tools/check_builds.sh
+++ b/tools/check_builds.sh
@@ -40,6 +40,7 @@ function do_builds
     while [ -n "$1" ]
     do
         rm -rf $TEST_BUILD_DIR/$PREFIX-$1
+        make PRODUCT-$(echo $1 | sed "s/-.*//" )-installclean
         make -j6 PRODUCT-$1 dist DIST_DIR=$TEST_BUILD_DIR/$PREFIX-$1
         if [ $? -ne 0 ] ; then
             echo FAILED
@@ -55,13 +56,37 @@ function golden_builds
     do_builds golden "$@"
 }
 
+function compare_builds
+{
+    local inputs=
+    while [ -n "$1" ]
+    do
+        inputs="$inputs $TEST_BUILD_DIR/golden-$1/installed-files.txt"
+        inputs="$inputs $TEST_BUILD_DIR/dist-$1/installed-files.txt"
+        shift
+    done
+    build/tools/compare_fileslist.py $inputs > $TEST_BUILD_DIR/sizes.html
+}
+
 function check_builds
 {
     rm -rf $TEST_BUILD_DIR/dist-*
     do_builds dist "$@"
-    build/tools/compare_fileslist.py \
-            $TEST_BUILD_DIR/golden-*/installed-files.txt \
-            $TEST_BUILD_DIR/dist-*/installed-files.txt \
-        > $TEST_BUILD_DIR/sizes.html
+    compare_builds "$@"
+}
+
+function diff_builds
+{
+    local inputs=
+    while [ -n "$1" ]
+    do
+        diff $TEST_BUILD_DIR/golden-$1/installed-files.txt $TEST_BUILD_DIR/dist-$1/installed-files.txt &> /dev/null
+        if [ $? != 0 ]; then
+            echo =========== $1 ===========
+            diff $TEST_BUILD_DIR/golden-$1/installed-files.txt $TEST_BUILD_DIR/dist-$1/installed-files.txt
+        fi
+        shift
+    done
+    build/tools/compare_fileslist.py $inputs > $TEST_BUILD_DIR/sizes.html
 }