From f4b5b11fa9c30c97b2002f32a5cdd8e3ba40d954 Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Tue, 26 May 2020 13:17:10 +0200 Subject: [PATCH 01/26] 20.1.0. update. --- .travis.yml | 4 +- ci.jsonnet | 2 +- copy_from_graal.py | 87 -------------- example.js | 40 +++++++ pom.xml | 267 ++++++++++++++++++++++++++----------------- runJsWithCoverage.sh | 43 ++++++- simpletool | 44 ++++++- 7 files changed, 287 insertions(+), 200 deletions(-) delete mode 100644 copy_from_graal.py diff --git a/.travis.yml b/.travis.yml index b561f5c..f85c7bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ os: language: java env: - - GRAALVM_VERSION="20.0.0" GRAALVM_JAVA_VERSION="8" - - GRAALVM_VERSION="20.0.0" GRAALVM_JAVA_VERSION="11" + - GRAALVM_VERSION="20.1.0" GRAALVM_JAVA_VERSION="8" + - GRAALVM_VERSION="20.1.0" GRAALVM_JAVA_VERSION="11" install: - cd .. && mv simpletool "simple tool" && cd "simple tool" diff --git a/ci.jsonnet b/ci.jsonnet index d38e6eb..0a4716f 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -11,7 +11,7 @@ local graalvm = { downloads+: { - JAVA_HOME: { name: 'graalvm', version: '20.0.0', platformspecific: true }, + JAVA_HOME: { name: 'graalvm', version: '20.1.0', platformspecific: true }, }, }, diff --git a/copy_from_graal.py b/copy_from_graal.py deleted file mode 100644 index 4ffaebe..0000000 --- a/copy_from_graal.py +++ /dev/null @@ -1,87 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -# Since Simple Tool is not developed on this repository, we need to periodically sync this repository with the developement one. -# This scipt automates cloning the source repository and copying the ST code from there to here. -# Requires git to be installed. - -import os -import sys -from subprocess import call - -GRAAL_REPO = "https://github.com/oracle/graal" -GRAAL_DIR = "../" + GRAAL_REPO.split('/')[-1] - -def fail(message): - """ Print message to stderr and exit script - - """ - print >> sys.stderr, message - sys.exit(1) - -def clone(repo, path = ""): - """ Clones the given repo url using git - - :repo: String containing the url - - """ - if call(["git", "clone", repo, path]) != 0: - fail("Could not clone " + repo) - pass - -def checkout(path, commit, create = False): - """ Checks out a new branch in SL - - :cwd: path to the git repo - :commit: String, name for the new branch - :create: create new or expect it to exist - - """ - command = ["git", "checkout"] - if create: - command.append("-b") - command.append(commit) - if call(command, cwd=path) != 0: - fail("Could not checkout " + commit + " from " + path) - -def replace(source, dest): - """ Replace contents of dest dir with contents of source dir - - :source: String path to source - :dest: String path do destination - - """ - call(["rm", "-rf", dest]) - call(["mkdir", "-p", dest]) - call(["cp", "-RTf", source, dest]) - -def copy_st(): - """ Copies ST from graal to simpletool - - """ - replace(GRAAL_DIR + "/truffle/src/com.oracle.truffle.st/src/com" , "src/main/java/com") - replace(GRAAL_DIR + "/truffle/src/com.oracle.truffle.st.test/src/com" , "src/test/java/com") - -def update_st(revision): - """ Updates the SL repo from the graal repo given a revision - - :revision: the hash of the commit in the graal repo to be used - - """ - checkout(".", "st_update_"+revision, True) - if os.path.isdir(GRAAL_DIR): - call(['git', 'fetch'], cwd=GRAAL_DIR) - else: - clone(GRAAL_REPO, GRAAL_DIR) - checkout(GRAAL_DIR, revision) - copy_st() - print "" - print "NOTE: Update the version in st, README.md and all pom.xml files!" - print "NOTE: Follow the instructions in README.md and make sure mvn package executes correctly!" - print "NOTE: Make sure project open correctly on the supported IDEs!" - print "" - -if __name__ == "__main__": - if (len(sys.argv) != 2): - fail("usage: " + sys.argv[0] + " idOfGraalCommitToUseAsBase") - update_st(sys.argv[1]) diff --git a/example.js b/example.js index 0ebc9d3..68b719c 100644 --- a/example.js +++ b/example.js @@ -1,3 +1,43 @@ +/* + * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * The Universal Permissive License (UPL), Version 1.0 + * + * Subject to the condition set forth below, permission is hereby granted to any + * person obtaining a copy of this software, associated documentation and/or + * data (collectively the "Software"), free of charge and under any and all + * copyright rights in the Software, and any and all patent rights owned or + * freely licensable by each licensor hereunder covering either (i) the + * unmodified Software as contributed to or provided by such licensor, or (ii) + * the Larger Works (as defined below), to deal in both + * + * (a) the Software, and + * + * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if + * one is included with the Software each a "Larger Work" to which the Software + * is contributed by such licensors), + * + * without restriction, including without limitation the rights to copy, create + * derivative works of, display, perform, and distribute the Software and make, + * use, sell, offer for sale, import, export, have made, and have sold the + * Software and the Larger Work(s), and to sublicense the foregoing rights on + * either these or other terms. + * + * This license is subject to the following condition: + * + * The above copyright notice and either this complete permission notice or at a + * minimum a reference to the UPL must be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ var N = 2000; var EXPECTED = 17393; diff --git a/pom.xml b/pom.xml index 1aaca8f..15fd848 100644 --- a/pom.xml +++ b/pom.xml @@ -1,113 +1,166 @@ - - 4.0.0 + - -Dgraalvm.locatorDisabled=true ${test.argLine} - - - - - + This license is subject to the following condition: + + The above copyright notice and either this complete permission notice or at a + minimum a reference to the UPL must be included in all copies or substantial + portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +--> + + 4.0.0 + com.oracle + simpletool + ${graalvm.version} + simpletool + + UTF-8 + 1.8 + 1.8 + 20.1.0 + + + + jdk11-graalvm + + [11, + + + ${project.build.directory}/jars + --upgrade-module-path=${jar.dir}/truffle-api.jar + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + copy + process-test-classes + + copy + + + + + org.graalvm.truffle + truffle-api + ${graalvm.version} + jar + true + truffle-api.jar + + + ${jar.dir} + + + + + + + + + jdk8-graalvm + + 1.8 + + + -XX:-UseJVMCIClassLoader + + + + + + junit + junit + 4.11 + test + + + org.graalvm.truffle + truffle-api + ${graalvm.version} + + + org.graalvm.truffle + truffle-dsl-processor + ${graalvm.version} + + + + + + maven-compiler-plugin + 3.8.0 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.9 + + + -Dgraalvm.locatorDisabled=true ${test.argLine} + + + + org.apache.maven.plugins + maven-shade-plugin + 3.1.1 + + + package + + shade + + + simpletool + + + junit:junit + com.oracle.truffle:truffle-api + com.oracle.truffle:truffle-dsl-processor + com.oracle.truffle:truffle-tck + org.graalvm:graal-sdk + + + + + + + + diff --git a/runJsWithCoverage.sh b/runJsWithCoverage.sh index 89df7da..bbe5665 100755 --- a/runJsWithCoverage.sh +++ b/runJsWithCoverage.sh @@ -1,2 +1,43 @@ -#!/bin/bash +#!/usr/bin/env bash +# +# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# The Universal Permissive License (UPL), Version 1.0 +# +# Subject to the condition set forth below, permission is hereby granted to any +# person obtaining a copy of this software, associated documentation and/or +# data (collectively the "Software"), free of charge and under any and all +# copyright rights in the Software, and any and all patent rights owned or +# freely licensable by each licensor hereunder covering either (i) the +# unmodified Software as contributed to or provided by such licensor, or (ii) +# the Larger Works (as defined below), to deal in both +# +# (a) the Software, and +# +# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if +# one is included with the Software each a "Larger Work" to which the Software +# is contributed by such licensors), +# +# without restriction, including without limitation the rights to copy, create +# derivative works of, display, perform, and distribute the Software and make, +# use, sell, offer for sale, import, export, have made, and have sold the +# Software and the Larger Work(s), and to sublicense the foregoing rights on +# either these or other terms. +# +# This license is subject to the following condition: +# +# The above copyright notice and either this complete permission notice or at a +# minimum a reference to the UPL must be included in all copies or substantial +# portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# + ./simpletool js example.js diff --git a/simpletool b/simpletool index 77e58cb..d655540 100755 --- a/simpletool +++ b/simpletool @@ -1,4 +1,44 @@ -#!/bin/bash +#!/usr/bin/env bash +# +# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# The Universal Permissive License (UPL), Version 1.0 +# +# Subject to the condition set forth below, permission is hereby granted to any +# person obtaining a copy of this software, associated documentation and/or +# data (collectively the "Software"), free of charge and under any and all +# copyright rights in the Software, and any and all patent rights owned or +# freely licensable by each licensor hereunder covering either (i) the +# unmodified Software as contributed to or provided by such licensor, or (ii) +# the Larger Works (as defined below), to deal in both +# +# (a) the Software, and +# +# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if +# one is included with the Software each a "Larger Work" to which the Software +# is contributed by such licensors), +# +# without restriction, including without limitation the rights to copy, create +# derivative works of, display, perform, and distribute the Software and make, +# use, sell, offer for sale, import, export, have made, and have sold the +# Software and the Larger Work(s), and to sublicense the foregoing rights on +# either these or other terms. +# +# This license is subject to the following condition: +# +# The above copyright notice and either this complete permission notice or at a +# minimum a reference to the UPL must be included in all copies or substantial +# portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# function printUsage() { echo "Usage:" @@ -15,6 +55,6 @@ shift "$JAVA_HOME/bin/$LAUNCHER" \ --jvm \ - --vm.Dtruffle.class.path.append=target/simpletool-20.0.0.jar \ + --vm.Dtruffle.class.path.append=target/simpletool.jar \ --simple-code-coverage \ "$@" From fa298ef846a2f6dc99b4b83701d22e179becdd56 Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Wed, 19 Aug 2020 10:01:45 +0200 Subject: [PATCH 02/26] Update to GraalVM 20.2.0 --- ci.jsonnet | 37 ------------------------------------- pom.xml | 2 +- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 ci.jsonnet diff --git a/ci.jsonnet b/ci.jsonnet deleted file mode 100644 index 0a4716f..0000000 --- a/ci.jsonnet +++ /dev/null @@ -1,37 +0,0 @@ -{ - local basicBuild = { - targets: ['gate'], - timelimit: '00:59:59', - run: [ - ['mvn', 'clean'], - ['mvn', 'package'], - ['./simpletool', 'js', 'example.js'], - ], - }, - - local graalvm = { - downloads+: { - JAVA_HOME: { name: 'graalvm', version: '20.1.0', platformspecific: true }, - }, - }, - - local linux = { - capabilities+: ['linux', 'amd64'], - packages+: { - maven: '==3.3.9', - }, - }, - - local darwin = { - capabilities+: ['darwin_sierra', 'amd64'], - environment+: { - MACOSX_DEPLOYMENT_TARGET: '10.11', - }, - }, - - builds: [ - basicBuild + linux + graalvm + { name: 'linux' }, - - basicBuild + darwin + graalvm + { name: 'darwin' }, - ], -} diff --git a/pom.xml b/pom.xml index 15fd848..394a3ba 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ UTF-8 1.8 1.8 - 20.1.0 + 20.2.0 From f4b3ef9dbaff0cd9c760d076b05f8542dacf4e7e Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Wed, 19 Aug 2020 10:12:18 +0200 Subject: [PATCH 03/26] Return and update ci. --- .travis.yml | 4 ++-- ci.jsonnet | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 ci.jsonnet diff --git a/.travis.yml b/.travis.yml index f85c7bb..dd1306b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ os: language: java env: - - GRAALVM_VERSION="20.1.0" GRAALVM_JAVA_VERSION="8" - - GRAALVM_VERSION="20.1.0" GRAALVM_JAVA_VERSION="11" + - GRAALVM_VERSION="20.2.0" GRAALVM_JAVA_VERSION="8" + - GRAALVM_VERSION="20.2.0" GRAALVM_JAVA_VERSION="11" install: - cd .. && mv simpletool "simple tool" && cd "simple tool" diff --git a/ci.jsonnet b/ci.jsonnet new file mode 100644 index 0000000..7a1b164 --- /dev/null +++ b/ci.jsonnet @@ -0,0 +1,37 @@ +{ + local basicBuild = { + targets: ['gate'], + timelimit: '00:59:59', + run: [ + ['mvn', 'clean'], + ['mvn', 'package'], + ['./simpletool', 'js', 'example.js'], + ], + }, + + local graalvm = { + downloads+: { + JAVA_HOME: { name: 'graalvm-ee-java8', version: '20.2.0', platformspecific: true }, + } + }, + + local linux = { + capabilities+: ['linux', 'amd64'], + packages+: { + maven: '==3.3.9', + }, + }, + + local darwin = { + capabilities+: ['darwin_sierra', 'amd64'], + environment+: { + MACOSX_DEPLOYMENT_TARGET: '10.11', + }, + }, + + builds: [ + basicBuild + linux + graalvm + { name: 'linux' }, + + basicBuild + darwin + graalvm + { name: 'darwin' }, + ], +} From 5c06b11b3036ebb24a09fd8877059ed2fde222ce Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Wed, 19 Aug 2020 11:03:31 +0200 Subject: [PATCH 04/26] Try manual patch of java home for mac. --- ci.jsonnet | 1 + 1 file changed, 1 insertion(+) diff --git a/ci.jsonnet b/ci.jsonnet index 7a1b164..c50062c 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -26,6 +26,7 @@ capabilities+: ['darwin_sierra', 'amd64'], environment+: { MACOSX_DEPLOYMENT_TARGET: '10.11', + JAVA_HOME: '$JAVA_HOME/Contents/Home' }, }, From fddc8eed6425a7826c589ea52789081ab6ebcc14 Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Wed, 19 Aug 2020 13:07:19 +0200 Subject: [PATCH 05/26] Added contribution file. --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..90de6cb --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1 @@ +This repository contains a snapshot of SimpleTool that is updated only after major changes. The development version is part of the Truffle repository: https://github.com/graalvm/truffle From b17d7912d781a46afc90f9ba7b5c60835b713647 Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Fri, 20 Nov 2020 13:23:49 +0100 Subject: [PATCH 06/26] Update to GraalVM 20.3.0 --- README.md | 5 ++--- pom.xml | 2 +- runJsWithCoverage.sh | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 590bb84..cde1547 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Simple Tool -A simple demonstration code coverage tool built using Truffle for the GraalVM. +A simple demonstration code coverage tool built using Truffle for GraalVM. The source code is documented to explain the how and why of writing a Truffle tool. A good way to find out more is to read the source with comments. We also @@ -9,5 +9,4 @@ like to encourage people to clone the repository and start hacking. This repository is licensed under the permissive UPL licence. Fork it to begin your own Truffle tool. -For instructions on how to get started please refer to [our -website](https://www.graalvm.org/docs/graalvm-as-a-platform/implement-instrument/) +For instructions on how to get started please refer to [our website](https://www.graalvm.org/docs/graalvm-as-a-platform/implement-instrument/) diff --git a/pom.xml b/pom.xml index 394a3ba..1966b50 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ UTF-8 1.8 1.8 - 20.2.0 + 20.3.0 diff --git a/runJsWithCoverage.sh b/runJsWithCoverage.sh index bbe5665..4002912 100755 --- a/runJsWithCoverage.sh +++ b/runJsWithCoverage.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # The Universal Permissive License (UPL), Version 1.0 From a6cacdad4924eefda24dc878832ae495ba34e77e Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Fri, 20 Nov 2020 13:28:57 +0100 Subject: [PATCH 07/26] Bump version is ci files. --- .travis.yml | 4 ++-- ci.jsonnet | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd1306b..bf216f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ os: language: java env: - - GRAALVM_VERSION="20.2.0" GRAALVM_JAVA_VERSION="8" - - GRAALVM_VERSION="20.2.0" GRAALVM_JAVA_VERSION="11" + - GRAALVM_VERSION="20.3.0" GRAALVM_JAVA_VERSION="8" + - GRAALVM_VERSION="20.3.0" GRAALVM_JAVA_VERSION="11" install: - cd .. && mv simpletool "simple tool" && cd "simple tool" diff --git a/ci.jsonnet b/ci.jsonnet index c50062c..96d1f88 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -11,7 +11,7 @@ local graalvm = { downloads+: { - JAVA_HOME: { name: 'graalvm-ee-java8', version: '20.2.0', platformspecific: true }, + JAVA_HOME: { name: 'graalvm-ee-java8', version: '20.3.0', platformspecific: true }, } }, From fbf7c16204a86c1c17a715fec0dab272356ee207 Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Fri, 7 May 2021 14:24:51 +0200 Subject: [PATCH 08/26] Update to GraalVM 21.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1966b50..40ade21 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ UTF-8 1.8 1.8 - 20.3.0 + 21.1.0 From cad9e5297e8f2a99f74b25a0191d72637891a4a6 Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Fri, 7 May 2021 14:28:15 +0200 Subject: [PATCH 09/26] Update version in CI files. --- .travis.yml | 4 ++-- ci.jsonnet | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index bf216f4..73c9f38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ os: language: java env: - - GRAALVM_VERSION="20.3.0" GRAALVM_JAVA_VERSION="8" - - GRAALVM_VERSION="20.3.0" GRAALVM_JAVA_VERSION="11" + - GRAALVM_VERSION="21.1.0" GRAALVM_JAVA_VERSION="8" + - GRAALVM_VERSION="21.1.0" GRAALVM_JAVA_VERSION="11" install: - cd .. && mv simpletool "simple tool" && cd "simple tool" diff --git a/ci.jsonnet b/ci.jsonnet index 96d1f88..edb126e 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -11,7 +11,7 @@ local graalvm = { downloads+: { - JAVA_HOME: { name: 'graalvm-ee-java8', version: '20.3.0', platformspecific: true }, + JAVA_HOME: { name: 'graalvm-ee-java8', version: '21.1.0', platformspecific: true }, } }, From 035f69adb876a8cb1ab6afa54e4959e6b48e732f Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Wed, 21 Jul 2021 08:03:56 +0200 Subject: [PATCH 10/26] Update to GraalVM 21.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40ade21..50162aa 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ UTF-8 1.8 1.8 - 21.1.0 + 21.2.0 From a79de77cd83fa65c913008ee9c3ceb34f9635a63 Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Wed, 21 Jul 2021 08:10:52 +0200 Subject: [PATCH 11/26] Update CI. --- ci.jsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.jsonnet b/ci.jsonnet index edb126e..56cffe6 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -11,7 +11,7 @@ local graalvm = { downloads+: { - JAVA_HOME: { name: 'graalvm-ee-java8', version: '21.1.0', platformspecific: true }, + JAVA_HOME: { name: 'graalvm-ee-java8', version: '21.2.0', platformspecific: true }, } }, From bf2f65f0291662e23d72af63b0eb3990e293e384 Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Mon, 4 Oct 2021 17:51:30 +0200 Subject: [PATCH 12/26] Update to GraalVM 21.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 50162aa..b4f9a7e 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ UTF-8 1.8 1.8 - 21.2.0 + 21.3.0 From 770b2ab95c89ec67925025759f1bc6aecb924452 Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Wed, 20 Oct 2021 11:36:52 +0200 Subject: [PATCH 13/26] Bump ci. --- ci.jsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.jsonnet b/ci.jsonnet index 56cffe6..636eb1e 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -11,7 +11,7 @@ local graalvm = { downloads+: { - JAVA_HOME: { name: 'graalvm-ee-java8', version: '21.2.0', platformspecific: true }, + JAVA_HOME: { name: 'graalvm-ee-java8', version: '21.3.0', platformspecific: true }, } }, From 43ef6a7752dcb89f29eaf2d02ab2bb686e4871f8 Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Mon, 24 Jan 2022 09:05:05 +0100 Subject: [PATCH 14/26] Update to GraalVM 22.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b4f9a7e..9222552 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ UTF-8 1.8 1.8 - 21.3.0 + 22.0.0 From fd3acccae0ecb727eaf170858bb5feada0d9c2ab Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Thu, 27 Jan 2022 14:32:50 +0100 Subject: [PATCH 15/26] Bump Graalvm in CI. --- ci.jsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.jsonnet b/ci.jsonnet index 636eb1e..9773238 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -11,7 +11,7 @@ local graalvm = { downloads+: { - JAVA_HOME: { name: 'graalvm-ee-java8', version: '21.3.0', platformspecific: true }, + JAVA_HOME: { name: 'graalvm-ee-java8', version: '22.0.0', platformspecific: true }, } }, From 0b3710e3925986261d94fb18a3048f6bc2a2bb26 Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Thu, 27 Jan 2022 15:49:04 +0100 Subject: [PATCH 16/26] Use jdk11 version of graalvm in CI. --- ci.jsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.jsonnet b/ci.jsonnet index 9773238..027b428 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -11,7 +11,7 @@ local graalvm = { downloads+: { - JAVA_HOME: { name: 'graalvm-ee-java8', version: '22.0.0', platformspecific: true }, + JAVA_HOME: { name: 'graalvm-ee-java11', version: '22.0.0', platformspecific: true }, } }, From 8f3171101a950609c4e5b654d464c9ea54b8571f Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Fri, 28 Jan 2022 10:09:32 +0100 Subject: [PATCH 17/26] use 22.0.0.2 in CI. --- ci.jsonnet | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci.jsonnet b/ci.jsonnet index 027b428..b25142f 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -11,7 +11,7 @@ local graalvm = { downloads+: { - JAVA_HOME: { name: 'graalvm-ee-java11', version: '22.0.0', platformspecific: true }, + JAVA_HOME: { name: 'graalvm-ee-java11', version: '22.0.0.2', platformspecific: true }, } }, diff --git a/pom.xml b/pom.xml index 9222552..92d5375 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ UTF-8 1.8 1.8 - 22.0.0 + 22.0.0.2 From dc4e4b56f5919b1c30bcae8396fa587164fc4210 Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Mon, 25 Apr 2022 11:54:29 +0200 Subject: [PATCH 18/26] Update to GraalVM 22.1 --- ci.jsonnet | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci.jsonnet b/ci.jsonnet index b25142f..d123596 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -11,7 +11,7 @@ local graalvm = { downloads+: { - JAVA_HOME: { name: 'graalvm-ee-java11', version: '22.0.0.2', platformspecific: true }, + JAVA_HOME: { name: 'graalvm-ce-java11', version: '22.1.0', platformspecific: true }, } }, diff --git a/pom.xml b/pom.xml index 92d5375..adf0638 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ UTF-8 1.8 1.8 - 22.0.0.2 + 22.1.0 From faa3e7b38267ebf5f31c323ca265f1282ed73603 Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Tue, 26 Jul 2022 13:48:38 +0200 Subject: [PATCH 19/26] Update to GraalVM 22.2 --- ci.jsonnet | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci.jsonnet b/ci.jsonnet index d123596..2157e0d 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -11,7 +11,7 @@ local graalvm = { downloads+: { - JAVA_HOME: { name: 'graalvm-ce-java11', version: '22.1.0', platformspecific: true }, + JAVA_HOME: { name: 'graalvm-ce-java11', version: '22.2.0', platformspecific: true }, } }, diff --git a/pom.xml b/pom.xml index adf0638..e946cf9 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ UTF-8 1.8 1.8 - 22.1.0 + 22.2.0 From a27e07bb81937f8396ceebfaf17a31274866b6bf Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Tue, 26 Jul 2022 16:00:07 +0200 Subject: [PATCH 20/26] Use ol7 in gate. --- ci.jsonnet | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci.jsonnet b/ci.jsonnet index 2157e0d..1687e47 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -20,6 +20,10 @@ packages+: { maven: '==3.3.9', }, + docker: { + image: "buildslave_ol7", + mount_modules: true, + }, }, local darwin = { From 53476193cb2ace22ba9a86fca29fe0c58126fadc Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Tue, 26 Jul 2022 16:29:06 +0200 Subject: [PATCH 21/26] Install js before testing simpletool. --- ci.jsonnet | 1 + 1 file changed, 1 insertion(+) diff --git a/ci.jsonnet b/ci.jsonnet index 1687e47..821e5b2 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -5,6 +5,7 @@ run: [ ['mvn', 'clean'], ['mvn', 'package'], + ["$JAVA_HOME/bin/gu", 'install', 'js'], ['./simpletool', 'js', 'example.js'], ], }, From e5b087339a3e93a7aaf8a72d2cf61e60e3868909 Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Tue, 18 Oct 2022 10:22:31 +0200 Subject: [PATCH 22/26] Update to GraalVM 22.3 --- ci.jsonnet | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci.jsonnet b/ci.jsonnet index 821e5b2..32d3a7c 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -12,7 +12,7 @@ local graalvm = { downloads+: { - JAVA_HOME: { name: 'graalvm-ce-java11', version: '22.2.0', platformspecific: true }, + JAVA_HOME: { name: 'graalvm-ce-java11', version: '22.3.0', platformspecific: true }, } }, diff --git a/pom.xml b/pom.xml index e946cf9..1b94078 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ UTF-8 1.8 1.8 - 22.2.0 + 22.3.0 @@ -107,7 +107,7 @@ junit junit - 4.11 + 4.13.1 test From 42407254ed99a920c0832ad9aa1775644ea7a789 Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Mon, 19 Jun 2023 10:32:52 +0200 Subject: [PATCH 23/26] Update to GraalVM 23.0 --- pom.xml | 2 +- .../java/com/oracle/truffle/st/SimpleCoverageInstrument.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1b94078..ff3925d 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ UTF-8 1.8 1.8 - 22.3.0 + 23.0.1-dev diff --git a/src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java b/src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java index af8ee89..1a302e6 100644 --- a/src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java +++ b/src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java @@ -179,7 +179,7 @@ private void enable(final Env env) { * @param env */ @Override - protected void onDispose(Env env) { + protected void onFinalize(Env env) { if (PRINT_COVERAGE.getValue(env.getOptions())) { printResults(env); } From dc08c76bcb0dacfb29019358487b36bc22eac9d4 Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Mon, 19 Jun 2023 10:43:48 +0200 Subject: [PATCH 24/26] Fix CI files. --- ci.jsonnet | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci.jsonnet b/ci.jsonnet index 32d3a7c..cdad18f 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -11,9 +11,9 @@ }, local graalvm = { - downloads+: { - JAVA_HOME: { name: 'graalvm-ce-java11', version: '22.3.0', platformspecific: true }, - } + downloads+: { + JAVA_HOME: { name: 'graalvm-community-java20', version: '23.0.0', platformspecific: true }, + }, }, local linux = { From 75080f793fc3c67f9ee8d57720878405301419f4 Mon Sep 17 00:00:00 2001 From: Boris Spasojevic Date: Mon, 19 Jun 2023 16:47:47 +0200 Subject: [PATCH 25/26] Fix graalvm version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ff3925d..2ab7fb0 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ UTF-8 1.8 1.8 - 23.0.1-dev + 23.0.0 From 53f7a4596ca36902cc28ae0b7a5ae0bb772257b6 Mon Sep 17 00:00:00 2001 From: Christian Humer Date: Fri, 6 Oct 2023 17:16:06 +0200 Subject: [PATCH 26/26] Update to GraalVM 23.1. --- .travis.yml | 25 ----- ci.jsonnet | 5 +- pom.xml | 198 +++++++++++++++------------------ runJsWithCoverage.sh | 2 +- simpletool | 21 +--- src/main/java/module-info.java | 50 +++++++++ src/test/java/module-info.java | 50 +++++++++ 7 files changed, 194 insertions(+), 157 deletions(-) delete mode 100644 .travis.yml create mode 100644 src/main/java/module-info.java create mode 100644 src/test/java/module-info.java diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 73c9f38..0000000 --- a/.travis.yml +++ /dev/null @@ -1,25 +0,0 @@ -os: - - linux - - osx - -language: java - -env: - - GRAALVM_VERSION="21.1.0" GRAALVM_JAVA_VERSION="8" - - GRAALVM_VERSION="21.1.0" GRAALVM_JAVA_VERSION="11" - -install: - - cd .. && mv simpletool "simple tool" && cd "simple tool" - - | - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then DOWNLOAD_OS_NAME="darwin"; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then DOWNLOAD_OS_NAME="linux"; fi - curl -LJ "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-$GRAALVM_VERSION/graalvm-ce-java$GRAALVM_JAVA_VERSION-$DOWNLOAD_OS_NAME-amd64-$GRAALVM_VERSION.tar.gz" --output graalvm.tar.gz - tar -xzf graalvm.tar.gz - export JAVA_HOME="$(pwd)/graalvm-ce-java$GRAALVM_JAVA_VERSION-$GRAALVM_VERSION" - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export JAVA_HOME="$JAVA_HOME/Contents/Home"; fi - -script: - - mvn package - - ./simpletool js example.js - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck simpletool; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck runJsWithCoverage.sh; fi diff --git a/ci.jsonnet b/ci.jsonnet index cdad18f..3fabe01 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -5,14 +5,13 @@ run: [ ['mvn', 'clean'], ['mvn', 'package'], - ["$JAVA_HOME/bin/gu", 'install', 'js'], - ['./simpletool', 'js', 'example.js'], + ['./simpletool', 'example.js'], ], }, local graalvm = { downloads+: { - JAVA_HOME: { name: 'graalvm-community-java20', version: '23.0.0', platformspecific: true }, + JAVA_HOME: { name: 'graalvm-community-java21', version: '23.1.0', platformspecific: true }, }, }, diff --git a/pom.xml b/pom.xml index 2ab7fb0..fd4171e 100644 --- a/pom.xml +++ b/pom.xml @@ -39,128 +39,106 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --> - - 4.0.0 - com.oracle - simpletool - ${graalvm.version} - simpletool - - UTF-8 - 1.8 - 1.8 - 23.0.0 - - - - jdk11-graalvm - - [11, - - - ${project.build.directory}/jars - --upgrade-module-path=${jar.dir}/truffle-api.jar - - + + 4.0.0 + com.oracle + simpletool + ${graalvm.version} + simpletool + + 23.1.0 + UTF-8 + 17 + 17 + jdt_apt + + + + junit + junit + 4.13.2 + test + + + org.graalvm.polyglot + polyglot + ${graalvm.version} + + + org.graalvm.truffle + truffle-api + ${graalvm.version} + + + org.graalvm.truffle + truffle-runtime + ${graalvm.version} + runtime + + + org.graalvm.sdk + jniutils + ${graalvm.version} + runtime + + + + org.graalvm.js + js-language + ${graalvm.version} + runtime + + + org.graalvm.js + js-launcher + ${graalvm.version} + + + org.apache.maven.plugins maven-dependency-plugin - 2.10 + 3.2.0 - copy - process-test-classes + copy-dependencies + package - copy + copy-dependencies - - - org.graalvm.truffle - truffle-api - ${graalvm.version} - jar - true - truffle-api.jar - - - ${jar.dir} + ${project.build.directory}/modules + true + + maven-compiler-plugin + 3.11.0 + + 17 + 17 + + + org.graalvm.truffle + truffle-dsl-processor + ${graalvm.version} + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.1.2 + + true + + - - - - jdk8-graalvm - - 1.8 - - - -XX:-UseJVMCIClassLoader - - - - - - junit - junit - 4.13.1 - test - - - org.graalvm.truffle - truffle-api - ${graalvm.version} - - - org.graalvm.truffle - truffle-dsl-processor - ${graalvm.version} - - - - - - maven-compiler-plugin - 3.8.0 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.9 - - - -Dgraalvm.locatorDisabled=true ${test.argLine} - - - - org.apache.maven.plugins - maven-shade-plugin - 3.1.1 - - - package - - shade - - - simpletool - - - junit:junit - com.oracle.truffle:truffle-api - com.oracle.truffle:truffle-dsl-processor - com.oracle.truffle:truffle-tck - org.graalvm:graal-sdk - - - - - - - - + diff --git a/runJsWithCoverage.sh b/runJsWithCoverage.sh index 4002912..fceab27 100755 --- a/runJsWithCoverage.sh +++ b/runJsWithCoverage.sh @@ -40,4 +40,4 @@ # SOFTWARE. # -./simpletool js example.js +./simpletool example.js diff --git a/simpletool b/simpletool index d655540..ed4ec93 100755 --- a/simpletool +++ b/simpletool @@ -40,21 +40,6 @@ # SOFTWARE. # -function printUsage() { - echo "Usage:" - echo "$0 " - echo "Example:" - echo "$0 js example.js" - exit 0 -} - -[ -z "$1" ] || [ "$1" == "--help" ] || [ "$1" == "-help" ] && printUsage - -LAUNCHER=$1 -shift - -"$JAVA_HOME/bin/$LAUNCHER" \ - --jvm \ - --vm.Dtruffle.class.path.append=target/simpletool.jar \ - --simple-code-coverage \ - "$@" +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +"$JAVA_HOME/bin/java" -p "${DIR}/target/modules:${DIR}/target/classes" -m org.graalvm.js.launcher/com.oracle.truffle.js.shell.JSLauncher --simple-code-coverage "$@" \ No newline at end of file diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java new file mode 100644 index 0000000..a967e31 --- /dev/null +++ b/src/main/java/module-info.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * The Universal Permissive License (UPL), Version 1.0 + * + * Subject to the condition set forth below, permission is hereby granted to any + * person obtaining a copy of this software, associated documentation and/or + * data (collectively the "Software"), free of charge and under any and all + * copyright rights in the Software, and any and all patent rights owned or + * freely licensable by each licensor hereunder covering either (i) the + * unmodified Software as contributed to or provided by such licensor, or (ii) + * the Larger Works (as defined below), to deal in both + * + * (a) the Software, and + * + * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if + * one is included with the Software each a "Larger Work" to which the Software + * is contributed by such licensors), + * + * without restriction, including without limitation the rights to copy, create + * derivative works of, display, perform, and distribute the Software and make, + * use, sell, offer for sale, import, export, have made, and have sold the + * Software and the Larger Work(s), and to sublicense the foregoing rights on + * either these or other terms. + * + * This license is subject to the following condition: + * + * The above copyright notice and either this complete permission notice or at a + * minimum a reference to the UPL must be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +module org.graalvm.st { + requires java.base; + requires java.logging; + requires jdk.unsupported; + requires org.graalvm.polyglot; + requires org.graalvm.truffle; + exports com.oracle.truffle.st to org.graalvm.st.test; + provides com.oracle.truffle.api.instrumentation.provider.TruffleInstrumentProvider with + com.oracle.truffle.st.SimpleCoverageInstrumentProvider; +} diff --git a/src/test/java/module-info.java b/src/test/java/module-info.java new file mode 100644 index 0000000..c65618d --- /dev/null +++ b/src/test/java/module-info.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * The Universal Permissive License (UPL), Version 1.0 + * + * Subject to the condition set forth below, permission is hereby granted to any + * person obtaining a copy of this software, associated documentation and/or + * data (collectively the "Software"), free of charge and under any and all + * copyright rights in the Software, and any and all patent rights owned or + * freely licensable by each licensor hereunder covering either (i) the + * unmodified Software as contributed to or provided by such licensor, or (ii) + * the Larger Works (as defined below), to deal in both + * + * (a) the Software, and + * + * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if + * one is included with the Software each a "Larger Work" to which the Software + * is contributed by such licensors), + * + * without restriction, including without limitation the rights to copy, create + * derivative works of, display, perform, and distribute the Software and make, + * use, sell, offer for sale, import, export, have made, and have sold the + * Software and the Larger Work(s), and to sublicense the foregoing rights on + * either these or other terms. + * + * This license is subject to the following condition: + * + * The above copyright notice and either this complete permission notice or at a + * minimum a reference to the UPL must be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +open module org.graalvm.st.test { + requires java.logging; + requires jdk.unsupported; + requires org.graalvm.polyglot; + requires junit; + requires org.graalvm.truffle; + requires org.graalvm.st; + exports com.oracle.truffle.st.test; + +}