Skip to content

Commit

Permalink
test graalvm build tools under graalvm ce 23.1.2. Apparently, the rel…
Browse files Browse the repository at this point in the history
…evant metadata has been submitted by me. Refer to graalvm/native-build-tools#572 .
  • Loading branch information
linghengqian committed Feb 17, 2024
1 parent 41b06ca commit d5b50cc
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 43 deletions.
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Start nativeTest

- In Windows 11, Jetbrains IntelliJ IDEA Ultimate installed by Jetbrains Toolbox AppImage under WSLg.
- Note, when executing unit tests implemented by GraalVM Truffle, be sure to additionally use `sdk use java 17.0.7-ms`
- ~~Note, when executing unit tests implemented by GraalVM Truffle, be sure to additionally use `sdk use java 21.0.2-ms`~~ Complete the survey on the ShardingSphere side
- Maybe you need to execute `su root` to switch to the root user to install grape, because it needs to write files
to `/usr/local/bin`.

Expand All @@ -17,10 +17,9 @@ cd /tmp
sudo apt install unzip zip curl sed -y
curl -s "https://get.sdkman.io" | bash
source "$HOME/.sdkman/bin/sdkman-init.sh"
sdk install java 17.0.8-graalce
sdk install java 17.0.8-ms
sdk use java 17.0.8-graalce
gu install js espresso
sdk install java 21.0.2-graalce
sdk install java 21.0.2-ms
sdk use java 21.0.2-graalce
sudo apt-get install build-essential libz-dev zlib1g-dev -y
sdk install gradle

Expand Down
10 changes: 9 additions & 1 deletion javax.cache/cache-api/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
plugins {
id 'java'
id 'org.graalvm.buildtools.native' version '0.9.19'
id 'org.graalvm.buildtools.native' version '0.10.0'
}

group 'com.lingh'
version '1.0-SNAPSHOT'

java {
sourceCompatibility = '21'
}

repositories {
mavenCentral()
}
Expand All @@ -16,6 +20,7 @@ dependencies {
testImplementation 'javax.cache:cache-api:1.1.1'
testImplementation 'org.jsr107.ri:cache-ri-impl:1.1.1'
testImplementation 'org.assertj:assertj-core:3.22.0'
testImplementation(group: 'org.graalvm.buildtools', name: 'graalvm-reachability-metadata', version: '0.10.0', classifier: 'repository', ext: 'zip')
}

test {
Expand All @@ -36,4 +41,7 @@ graalvmNative {
outputDirectories.add("src/test/resources/META-INF/native-image/javax.cache/cache-api")
}
}
metadataRepository {
enabled.set(false)
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
29 changes: 17 additions & 12 deletions javax.cache/cache-api/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,26 +131,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,6 @@
"lambdaCapturingTypes": [],
"proxies": [],
"types": [
{
"condition":{"typeReachable":"java.lang.Object"},
"name": "javax.cache.configuration.FactoryBuilder$SingletonFactory"
},
{
"condition":{"typeReachable":"java.lang.Object"},
"name": "javax.cache.expiry.AccessedExpiryPolicy"
},
{
"condition":{"typeReachable":"java.lang.Object"},
"name": "javax.cache.expiry.Duration"
},
{
"condition":{"typeReachable":"java.lang.Object"},
"name": "javax.cache.expiry.EternalExpiryPolicy"
},
{
"condition":{"typeReachable":"java.lang.Object"},
"name": "java.lang.String"
Expand Down

0 comments on commit d5b50cc

Please sign in to comment.