Skip to content

Commit 1b49d25

Browse files
committed
allow us to execute a script outside gpudev/util directory
1 parent 0db2aae commit 1b49d25

File tree

10 files changed

+19
-10
lines changed

10 files changed

+19
-10
lines changed

gpudev/util/args.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
DIR=../..
1+
DIR=$SCRIPT_DIR/../..
22
#ABSOLUTE_DIR=`realpath $DIR`
33
ABSOLUTE_DIR=`readlink -e $DIR`
44
# might need to use -Dos.arch=ppc64le on OpenJDK in MAVEN_OPTS and JAVA_OPTS because of a bug
55
export MAVEN_OPTS="$MAVEN_OPTS -Xmx32G -XX:MaxPermSize=8G -XX:ReservedCodeCacheSize=2G"
6-
MVN_ARGS="-Pyarn -Phadoop-2.4 -Dhadoop.version=2.4.0 -Dscala-2.11 -Phive-thriftserver -Phive"
6+
#MVN_ARGS="-Pyarn -Phadoop-2.4 -Dhadoop.version=2.4.0 -Dscala-2.11 -Phive-thriftserver -Phive"
7+
MVN_ARGS="-Pyarn -Phadoop-2.4 -Dhadoop.version=2.4.0 -Dscala-2.11"
78
export JAVA_OPTS="-Xms2M -Xmx32G -XX:MaxPermSize=8G -XX:ReservedCodeCacheSize=2G"
89

910
#export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-ppc64el"

gpudev/util/compile.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
# ./compile.sh full - package everything ("normal" compilation)
66
# ./compile.sh clean full install - package and install everything ("normal" clean install)
77

8-
source args.sh
8+
SCRIPT_DIR=$(cd $(dirname $(readlink -f $0 || echo $0));pwd -P)
9+
source $SCRIPT_DIR/args.sh
910
echo $DIR
1011
cd $DIR
1112

gpudev/util/debugtest.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
2-
source args.sh
2+
SCRIPT_DIR=$(cd $(dirname $(readlink -f $0 || echo $0));pwd -P)
3+
source $SCRIPT_DIR/args.sh
34
cd $DIR
45

56
jdb -attach $DBG_PORT

gpudev/util/md.log

Whitespace-only changes.

gpudev/util/sbttest.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22
# should run a test, but doesn't work
3-
source args.sh
3+
SCRIPT_DIR=$(cd $(dirname $(readlink -f $0 || echo $0));pwd -P)
4+
source $SCRIPT_DIR/args.sh
45
cd $DIR
56

67
SCALA_TESTS=\

gpudev/util/scala-cc.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
2-
source args.sh
2+
SCRIPT_DIR=$(cd $(dirname $(readlink -f $0 || echo $0));pwd -P)
3+
source $SCRIPT_DIR/args.sh
34
cd $DIR
45

56
if [[ "$1" != "" ]]; then

gpudev/util/scala-console.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
2-
source args.sh
2+
SCRIPT_DIR=$(cd $(dirname $(readlink -f $0 || echo $0));pwd -P)
3+
source $SCRIPT_DIR/args.sh
34
cd $DIR/core
45
trap '' 2
56
export LD_LIBRARY_PATH="target/lib:$LD_LIBRARY_PATH"

gpudev/util/testall.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
2-
source args.sh
2+
SCRIPT_DIR=$(cd $(dirname $(readlink -f $0 || echo $0));pwd -P)
3+
source $SCRIPT_DIR/args.sh
34
cd $DIR
45

56
$MVN_CMD $MVN_ARGS -DtagsToExclude=$EXCL_TAGS --fail-never test $@ 2>&1 | tee ~/testlog-all.txt

gpudev/util/testcore.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
2-
source args.sh
2+
SCRIPT_DIR=$(cd $(dirname $(readlink -f $0 || echo $0));pwd -P)
3+
source $SCRIPT_DIR/args.sh
34
cd $DIR
45

56
$MVN_CMD $MVN_ARGS -DtagsToExclude=$EXCL_TAGS --fail-at-end test -pl core $@ 2>&1 | tee ~/testlog-core.txt

gpudev/util/testdev.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# run only the tests being worked on
33
# ./testdev.sh compile also compiles the stuff before
44
# ./testdev.sh debug waits for attachment of a scala debugger
5-
source args.sh
5+
SCRIPT_DIR=$(cd $(dirname $(readlink -f $0 || echo $0));pwd -P)
6+
source $SCRIPT_DIR/args.sh
67
cd $DIR
78

89
SCALA_TESTS=\

0 commit comments

Comments
 (0)