summaryrefslogtreecommitdiff
path: root/setup_environment
diff options
context:
space:
mode:
authorTor Aamodt <[email protected]>2018-04-11 14:33:53 -0700
committerGitHub <[email protected]>2018-04-11 14:33:53 -0700
commitcdb59de6dc329ce5777e3c961c09d26f37d32fec (patch)
treed5107199f935391aead8e2415db8931c9fe91805 /setup_environment
parent2221d208a745a098a60b0d24c05007e92aaba092 (diff)
parent89094df5b4e861b104393ea0f41886494a7f26a4 (diff)
Merge pull request #65 from tgrogers/dev
Bunch of changes made to 3.x that help with data collection
Diffstat (limited to 'setup_environment')
-rw-r--r--setup_environment3
1 files changed, 2 insertions, 1 deletions
diff --git a/setup_environment b/setup_environment
index 96cc362..3f2476e 100644
--- a/setup_environment
+++ b/setup_environment
@@ -8,7 +8,8 @@ export GPGPUSIM_ROOT="$( cd "$( dirname "$BASH_SOURCE" )" && pwd )"
GPGPUSIM_VERSION_STRING=`cat $GPGPUSIM_ROOT/version | awk '/Version/ {print $8}'`
#Detect Git branch and commit #
GIT_COMMIT=`git log -n 1 | head -1 | sed -re 's/commit (.*)/\1/'`
-GIT_FILES_CHANGED=`git diff --numstat --cached && git diff --numstat | wc | sed -re 's/^\s+([0-9]+).*/\1/'`
+GIT_FILES_CHANGED=`git diff --numstat | wc | sed -re 's/^\s+([0-9]+).*/\1./'`
+GIT_FILES_CHANGED+=`git diff --numstat --cached | wc | sed -re 's/^\s+([0-9]+).*/\1/'`
GPGPUSIM_BUILD_STRING="gpgpu-sim_git-commit-$GIT_COMMIT-modified_$GIT_FILES_CHANGED"
echo -n "GPGPU-Sim version $GPGPUSIM_VERSION_STRING (build $GPGPUSIM_BUILD_STRING) ";