Revert "Turn on debugging"

This reverts commit cfaf0bf146c2c9e7598faf6c9efb044b8b7dba33.

https://gerrit.fd.io/r/#/c/1399/
As it bore no resemblance to the original gerrit submitted and currently has broken all of tldk verify.

Change-Id: If9914f8ade100b56c3a979adda1107f21b9c3c3f
Signed-off-by: Ed Warnicke <[email protected]>

diff --git a/jjb/tldk/include-raw-build.sh b/jjb/tldk/include-raw-build.sh
index 7e28cb9..f4ba63b 100644 (file)
--- a/jjb/tldk/include-raw-build.sh
+++ b/jjb/tldk/include-raw-build.sh
@@ -1,11 +1,32 @@
 #!/bin/bash
-
 # basic build script example
-DEBUG=1
 set -e -o pipefail
+# do nothing but print the current slave hostname
+hostname
+export CCACHE_DIR=/tmp/ccache
+if [ -d $CCACHE_DIR ];then
+    echo $CCACHE_DIR exists
+    du -sk $CCACHE_DIR
+else
+    echo $CCACHE_DIR does not exist.  This must be a new slave.
+fi
+
+echo "cat /etc/bootstrap.sha"
+if [ -f /etc/bootstrap.sha ];then
+    cat /etc/bootstrap.sha
+else
+    echo "Cannot find /etc/bootstrap.sha"
+fi
+
+echo "cat /etc/bootstrap-functions.sha"
+if [ -f /etc/bootstrap-functions.sha ];then
+    cat /etc/bootstrap-functions.sha
+else
+    echo "Cannot find /etc/bootstrap-functions.sha"
+fi
 
-SCRIPTDIR=$(realpath "$(dirname $0)/../../")
-[ "${DEBUG}" -gt "0" ] && source "${SCRIPTDIR}/scripts/debug.sh"
+echo "sha1sum of this script: ${0}"
+sha1sum $0
 
 make
 

diff --git a/scripts/debug.sh b/scripts/debug.sh
deleted file mode 100644 (file)
index f8f9aad..0000000
--- a/scripts/debug.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -x
-
-# print the current slave hostname
-echo "Slave hostname:" $(hostname)
-
-CCACHE_DIR=/tmp/ccache
-if [ -d $CCACHE_DIR ];then
-    echo "$CCACHE_DIR size in KB:" $(du -sk $CCACHE_DIR|cut -f1)
-else
-    echo "$CCACHE_DIR does not exist. Slave" $(uptime -p)
-fi
-
-PFX=/etc/bootstrap
-
-for FILE in "${PFX}.sha" "${PFX}-functions.sha"
-do
-    test -f ${FILE} || (echo "Cannot find ${FILE}" && continue)
-
-    CMD="cat ${FILE}"
-    echo ${CMD} && eval "${CMD}"
-done
-
-echo "sha1 of ${0}:" $(sha1sum $0 | cut -d' ' -f 1)