8000 Better way to determine script directory by mernst · Pull Request #7090 · typetools/checker-framework · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Better way to determine script directory #7090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions .travis-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ fi
export CHECKERFRAMEWORK="${CHECKERFRAMEWORK:-$(pwd -P)}"
echo "CHECKERFRAMEWORK=$CHECKERFRAMEWORK"

ROOTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPTDIR=$ROOTDIR/checker/bin-devel/
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
BIN_DEVEL_DIR="${SCRIPT_DIR}/checker/bin-devel/"

# For debugging
(cd "$CHECKERFRAMEWORK" && ./gradlew getPlumeScripts)
"${SCRIPTDIR}/plume-scripts/ci-info" typetools
eval "$("${SCRIPTDIR}/plume-scripts/ci-info" typetools)"
"${BIN_DEVEL_DIR}/plume-scripts/ci-info" typetools
eval "$("${BIN_DEVEL_DIR}/plume-scripts/ci-info" typetools)"

source "$SCRIPTDIR/checker/bin-devel/clone-related.sh"
source "$BIN_DEVEL_DIR/checker/bin-devel/clone-related.sh"

###
### Run the test
Expand All @@ -52,18 +52,18 @@ case $GROUP in
all)
# Run cftests-junit, cftests-nonjunit, and cftests-inference separately,
# because cftests-all takes too long to run on Travis.
"$SCRIPTDIR/test-cftests-junit.sh"
"$SCRIPTDIR/test-cftests-nonjunit.sh"
"$SCRIPTDIR/test-cftests-inference.sh"
"$SCRIPTDIR/test-misc.sh"
"$SCRIPTDIR/test-typecheck.sh"
"$SCRIPTDIR/test-plume-lib.sh"
"$SCRIPTDIR/test-daikon.sh"
"$SCRIPTDIR/test-guava.sh"
"$SCRIPTDIR/test-downstream.sh"
"$BIN_DEVEL_DIR/test-cftests-junit.sh"
"$BIN_DEVEL_DIR/test-cftests-nonjunit.sh"
"$BIN_DEVEL_DIR/test-cftests-inference.sh"
"$BIN_DEVEL_DIR/test-misc.sh"
"$BIN_DEVEL_DIR/test-typecheck.sh"
"$BIN_DEVEL_DIR/test-plume-lib.sh"
"$BIN_DEVEL_DIR/test-daikon.sh"
"$BIN_DEVEL_DIR/test-guava.sh"
"$BIN_DEVEL_DIR/test-downstream.sh"
;;
*)
"${SCRIPTDIR}/test-${GROUP}.sh"
"${BIN_DEVEL_DIR}/test-${GROUP}.sh"
;;
esac

Expand Down
4 changes: 2 additions & 2 deletions checker/bin-devel/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ echo Entering checker/bin-devel/build.sh in "$(pwd)"
# Fail the whole script if any command fails
set -e

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
source "$SCRIPTDIR"/clone-related.sh
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
source "$SCRIPT_DIR"/clone-related.sh
# Download dependencies, trying a second time if there is a failure.
# echo "NO_WRITE_VERIFICATION_METADATA=$NO_WRITE_VERIFICATION_METADATA"
if [ -z "${NO_WRITE_VERIFICATION_METADATA+x}" ]; then
Expand Down
4 changes: 2 additions & 2 deletions checker/bin-devel/test-cftests-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

export ORG_GRADLE_PROJECT_useJdk21Compiler=true
SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
source "$SCRIPTDIR"/clone-related.sh
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
source "$SCRIPT_DIR"/clone-related.sh

./gradlew allTests --console=plain --warning-mode=all
# Moved example-tests out of all tests because it fails in
Expand Down
4 changes: 2 additions & 2 deletions checker/bin-devel/test-cftests-inference-part1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

./gradlew inferenceTests-part1 --console=plain --warning-mode=all
4 changes: 2 additions & 2 deletions checker/bin-devel/test-cftests-inference-part2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

./gradlew inferenceTests-part2 --console=plain --warning-mode=all
4 changes: 2 additions & 2 deletions checker/bin-devel/test-cftests-inference.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

./gradlew inferenceTests --console=plain --warning-mode=all
4 changes: 2 additions & 2 deletions checker/bin-devel/test-cftests-junit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

./gradlew test --console=plain --warning-mode=all
4 changes: 2 additions & 2 deletions checker/bin-devel/test-cftests-nonjunit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

./gradlew nonJunitTests --console=plain --warning-mode=all
./gradlew publishToMavenLocal --console=plain --warning-mode=all
Expand Down
6 changes: 3 additions & 3 deletions checker/bin-devel/test-daikon-part1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

# Run assembleForJavac because it does not build the javadoc, so it is faster than assemble.
echo "running \"./gradlew assembleForJavac\" for checker-framework"
./gradlew assembleForJavac --console=plain -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.http.connectionTimeout=60000

# daikon-typecheck: 15 minutes
"$SCRIPTDIR/.git-scripts/git-clone-related" codespecs daikon
"$SCRIPT_DIR/.git-scripts/git-clone-related" codespecs daikon
cd ../daikon
git log | head -n 5
make --jobs="$(getconf _NPROCESSORS_ONLN)" compile
Expand Down
6 changes: 3 additions & 3 deletions checker/bin-devel/test-daikon-part2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

# Run assembleForJavac because it does not build the javadoc, so it is faster than assemble.
echo "running \"./gradlew assembleForJavac\" for checker-framework"
./gradlew assembleForJavac --console=plain -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.http.connectionTimeout=60000

# daikon-typecheck: 15 minutes
"$SCRIPTDIR/.git-scripts/git-clone-related" codespecs daikon
"$SCRIPT_DIR/.git-scripts/git-clone-related" codespecs daikon
cd ../daikon
git log | head -n 5
make --jobs="$(getconf _NPROCESSORS_ONLN)" compile
Expand Down
6 changes: 3 additions & 3 deletions checker/bin-devel/test-daikon.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

# Run assembleForJavac because it does not build the javadoc, so it is faster than assemble.
echo "running \"./gradlew assembleForJavac\" for checker-framework"
./gradlew assembleForJavac --console=plain -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.http.connectionTimeout=60000

# daikon-typecheck: 15 minutes
"$SCRIPTDIR/.git-scripts/git-clone-related" codespecs daikon
"$SCRIPT_DIR/.git-scripts/git-clone-related" codespecs daikon
cd ../daikon
git log | head -n 5
make --jobs="$(getconf _NPROCESSORS_ONLN)" compile
Expand Down
4 changes: 2 additions & 2 deletions checker/bin-devel/test-downstream.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

## downstream tests: projects that depend on the Checker Framework.
## (There are none currently in this file.)
Expand Down
6 changes: 3 additions & 3 deletions checker/bin-devel/test-guava-formatter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

"$SCRIPTDIR/.git-scripts/git-clone-related" typetools guava
"$SCRIPT_DIR/.git-scripts/git-clone-related" typetools guava
cd ../guava

./typecheck.sh formatter
6 changes: 3 additions & 3 deletions checker/bin-devel/test-guava-index.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

"$SCRIPTDIR/.git-scripts/git-clone-related" typetools guava
"$SCRIPT_DIR/.git-scripts/git-clone-related" typetools guava
cd ../guava

if [ "$TRAVIS" = "true" ]; then
Expand Down
6 changes: 3 additions & 3 deletions checker/bin-devel/test-guava-interning.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

"$SCRIPTDIR/.git-scripts/git-clone-related" typetools guava
"$SCRIPT_DIR/.git-scripts/git-clone-related" typetools guava
cd ../guava

./typecheck.sh interning
6 changes: 3 additions & 3 deletions checker/bin-devel/test-guava-lock.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

"$SCRIPTDIR/.git-scripts/git-clone-related" typetools guava
"$SCRIPT_DIR/.git-scripts/git-clone-related" typetools guava
cd ../guava

./typecheck.sh lock
6 changes: 3 additions & 3 deletions checker/bin-devel/test-guava-nullness.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

"$SCRIPTDIR/.git-scripts/git-clone-related" typetools guava
"$SCRIPT_DIR/.git-scripts/git-clone-related" typetools guava
cd ../guava

./typecheck.sh nullness
6 changes: 3 additions & 3 deletions checker/bin-devel/test-guava-regex.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

"$SCRIPTDIR/.git-scripts/git-clone-related" typetools guava
"$SCRIPT_DIR/.git-scripts/git-clone-related" typetools guava
cd ../guava

./typecheck.sh regex
6 changes: 3 additions & 3 deletions checker/bin-devel/test-guava-signature.sh
cd ../guava
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

"$SCRIPTDIR/.git-scripts/git-clone-related" typetools guava
"$SCRIPT_DIR/.git-scripts/git-clone-related" typetools guava

./typecheck.sh signature
9 changes: 5 additions & 4 deletions checker/bin-devel/test-guava.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

./gradlew assembleForJavac --console=plain -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.http.connectionTimeout=60000

# TODO: Maybe I should move this into the CI job, and do it for all CI jobs.
cp "$SCRIPTDIR"/mvn-settings.xml ~/settings.xml
cp "$SCRIPT_DIR"/mvn-settings.xml ~/settings.xml

"$SCRIPTDIR/.git-scripts/git-clone-related" typetools guava
"$SCRIPT_DIR/.git-scripts/git-clone-related" typetools guava
cd ../guava

if [ "$TRAVIS" = "true" ]; then
Expand Down
6 changes: 3 additions & 3 deletions checker/bin-devel/test-misc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

PLUME_SCRIPTS="$SCRIPTDIR/.plume-scripts"
PLUME_SCRIPTS="$SCRIPT_DIR/.plume-scripts"

status=0

Expand Down
7 changes: 4 additions & 3 deletions checker/bin-devel/test-plume-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ if [ -z ${PACKAGES+x} ]; then
fi
echo "PACKAGES=" "${PACKAGES[@]}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

./gradlew assembleForJavac --console=plain -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.http.connectionTimeout=60000

failing_packages=""
Expand All @@ -41,7 +42,7 @@ for PACKAGE in "${PACKAGES[@]}"; do
echo "PACKAGE=${PACKAGE}"
PACKAGEDIR="/tmp/${PACKAGE}"
rm -rf "${PACKAGEDIR}"
"$SCRIPTDIR/.git-scripts/git-clone-related" plume-lib "${PACKAGE}" "${PACKAGEDIR}"
"$SCRIPT_DIR/.git-scripts/git-clone-related" plume-lib "${PACKAGE}" "${PACKAGEDIR}"
# Uses "compileJava" target instead of "assemble" to avoid the javadoc error "Error fetching URL:
# https://docs.oracle.com/en/java/javase/17/docs/api/" due to network problems.
echo "About to call ./gradlew --console=plain -PcfLocal compileJava"
Expand Down
4 changes: 2 additions & 2 deletions checker/bin-devel/test-typecheck-part1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

# Pluggable type-checking: run the Checker Framework on itself
./gradlew typecheck-part1 --console=plain --warning-mode=all
Expand Down
4 changes: 2 additions & 2 deletions checker/bin-devel/test-typecheck-part2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

# Pluggable type-checking: run the Checker Framework on itself
./gradlew typecheck-part2 --console=plain --warning-mode=all
4 changes: 2 additions & 2 deletions checker/bin-devel/test-typecheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ set -o xtrace
export SHELLOPTS
echo "SHELLOPTS=${SHELLOPTS}"

SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
export ORG_GRADLE_PROJECT_useJdk21Compiler=true
source "$SCRIPTDIR"/clone-related.sh
source "$SCRIPT_DIR"/clone-related.sh

# Pluggable type-checking: run the Checker Framework on itself
./gradlew typecheck --console=plain --warning-mode=all
Loading
0