This is an automated email from the ASF dual-hosted git repository. leerho pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/datasketches-memory17.git
commit 9b9a5899ac072f995a27f8ae168689d003159332 Author: Lee Rhodes <[email protected]> AuthorDate: Mon Oct 16 12:07:34 2023 -0700 Update memory17 --- ...tasketches-memory-tests-3.0.0.jar_Manifests.txt | 12 +++++ Manifests/jcommander-1.82.jar_Manifest.txt | 18 +++++++ Manifests/slf4j-api-1.7.36.jar_Manifest.txt | 25 +++++++++ Manifests/slf4j-nop-1.7.36.jar_Manifest.txt | 25 +++++++++ Manifests/testng-7.8.0.jar_Manifest.txt | 56 +++++++++++++++++++++ .../zero-allocation-hashing-0.15_Manifest.txt | 30 +++++++++++ compile.sh | 4 +- ...sts.jar => datasketches-memory-tests-3.0.0.jar} | Bin libs/myargfile.txt | 27 ++++++++++ testng.xml => libs/testng.xml | 10 ++-- compile.sh => runtestng.sh | 36 +------------ 11 files changed, 201 insertions(+), 42 deletions(-) diff --git a/Manifests/datasketches-memory-tests-3.0.0.jar_Manifests.txt b/Manifests/datasketches-memory-tests-3.0.0.jar_Manifests.txt new file mode 100644 index 0000000..9bcf0c7 --- /dev/null +++ b/Manifests/datasketches-memory-tests-3.0.0.jar_Manifests.txt @@ -0,0 +1,12 @@ +datasketches-memory-tests-3.0.0.jar #NOTE RENAMED THE FILE!! + +$ jar --describe-module --file datasketches-memory-tests-3.0.0.jar +No module descriptor found. Derived automatic module. + [email protected] automatic +requires java.base mandated +contains org.apache.datasketches.memory.internal + +$ unzip -p datasketches-memory-tests-3.0.0.jar META-INF/MANIFEST.MF +Manifest-Version: 1.0 +Created-By: 17.0.8 (Eclipse Adoptium) diff --git a/Manifests/jcommander-1.82.jar_Manifest.txt b/Manifests/jcommander-1.82.jar_Manifest.txt new file mode 100644 index 0000000..c354f1c --- /dev/null +++ b/Manifests/jcommander-1.82.jar_Manifest.txt @@ -0,0 +1,18 @@ +jcommander-1.82.jar + +$ unzip -p jcommander-1.82.jar META-INF/MANIFEST.MF +Manifest-Version: 1.0 + +$ jar --describe-module --file jcommander-1.82.jar +No module descriptor found. Derived automatic module. + [email protected] automatic +requires java.base mandated +contains com.beust.ah +contains com.beust.jcommander +contains com.beust.jcommander.converters +contains com.beust.jcommander.defaultprovider +contains com.beust.jcommander.internal +contains com.beust.jcommander.parser +contains com.beust.jcommander.validators + diff --git a/Manifests/slf4j-api-1.7.36.jar_Manifest.txt b/Manifests/slf4j-api-1.7.36.jar_Manifest.txt new file mode 100644 index 0000000..604d408 --- /dev/null +++ b/Manifests/slf4j-api-1.7.36.jar_Manifest.txt @@ -0,0 +1,25 @@ +slf4j-api-1.7.36.jar +# This is an automatic module; name=org.slf4j +$ unzip -p slf4j-api-1.7.36.jar META-INF/MANIFEST.MF +Manifest-Version: 1.0 +Bundle-Description: The slf4j API +Implementation-Title: slf4j-api +Automatic-Module-Name: org.slf4j +Bundle-SymbolicName: slf4j.api +Implementation-Version: 1.7.36 +Bundle-ManifestVersion: 2 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Vendor: SLF4J.ORG +Import-Package: + org.slf4j.impl;version=1.6.0 +Export-Package: + org.slf4j;version=1.7.36, + org.slf4j.spi;version=1.7.36, + org.slf4j.helpers;version=1.7.36, + org.slf4j.event;version=1.7.36 +Bundle-Version: 1.7.36 +Bundle-Name: slf4j-api +X-Compile-Target-JDK: 1.5 +X-Compile-Source-JDK: 1.5 +Build-Jdk-Spec: 1.8 +Created-By: Maven Jar Plugin 3.2.0 \ No newline at end of file diff --git a/Manifests/slf4j-nop-1.7.36.jar_Manifest.txt b/Manifests/slf4j-nop-1.7.36.jar_Manifest.txt new file mode 100644 index 0000000..65abdb3 --- /dev/null +++ b/Manifests/slf4j-nop-1.7.36.jar_Manifest.txt @@ -0,0 +1,25 @@ +slf4j-nop-1.7.36.jar +# This is an automatic module; name=org.slf4j.nop +$ unzip -p slf4j-nop-1.7.36.jar META-INF/MANIFEST.MF +Manifest-Version: 1.0 +Bundle-Description: SLF4J NOP Binding +Implementation-Title: slf4j-nop +Automatic-Module-Name: org.slf4j.nop +Bundle-SymbolicName: slf4j.nop +Implementation-Version: 1.7.36 +Bundle-ManifestVersion: 2 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Vendor: SLF4J.ORG +Import-Package: + org.slf4j;version=1.7.36, + org.slf4j.spi;version=1.7.36, + org.slf4j.helpers;version=1.7.36, + org.slf4j.event;version=1.7.36 +Export-Package: + org.slf4j.impl;version=1.7.36 +Bundle-Version: 1.7.36 +Bundle-Name: slf4j-nop +X-Compile-Target-JDK: 1.5 +X-Compile-Source-JDK: 1.5 +Build-Jdk-Spec: 1.8 +Created-By: Maven Jar Plugin 3.2.0 \ No newline at end of file diff --git a/Manifests/testng-7.8.0.jar_Manifest.txt b/Manifests/testng-7.8.0.jar_Manifest.txt new file mode 100644 index 0000000..c55c615 --- /dev/null +++ b/Manifests/testng-7.8.0.jar_Manifest.txt @@ -0,0 +1,56 @@ +testng-7.8.0.jar +# This is an automatic module; name=org.testng +unzip -p testng-7.8.0.jar META-INF/MANIFEST.MF +Manifest-Version: 1.0 +Specification-Title: TestNG +Specification-Version: 7.8.0 +Specification-Vendor: TestNG +Implementation-Title: TestNG +Implementation-Version: 7.8.0 +Implementation-Vendor: TestNG +Implementation-Vendor-Id: org.testng +Implementation-Url: https://testng.org +Automatic-Module-Name: org.testng +Bundle-ManifestVersion: 2 +Bundle-Name: TestNG +Bundle-SymbolicName: org.testng +Bundle-Vendor: TestNG +Bundle-License: Apache-2.0 +Bundle-Description: Testing framework for Java +Bundle-Version: 7.8.0 +Import-Package: + bsh.*;version="[2.0.0,3.0.0)";resolution:=optional, + com.beust.jcommander.*;version="[1.7.0,3.0.0)";resolution:=optional, + com.google.inject.*;version="[1.2,1.3)";resolution:=optional, + junit.framework;version="[3.8.1, 5.0.0)";resolution:=optional, + org.junit.*;resolution:=optional, + org.apache.tools.ant.*;version="[1.7.0, 2.0.0)";resolution:=optional, + org.yaml.*;version="[1.6,2.0)";resolution:=optional, + *;resolution:=optional +Export-Package: + org.testng, + org.testng.annotations, + org.testng.asserts, + org.testng.collections, + org.testng.internal, + org.testng.internal.annotations, + org.testng.internal.ant, + org.testng.internal.collections, + org.testng.internal.invokers, + org.testng.internal.invokers.objects, + org.testng.internal.junit, + org.testng.internal.objects, + org.testng.internal.objects.pojo, + org.testng.internal.reflect, + org.testng.internal.thread, + org.testng.internal.thread.graph, + org.testng.junit, + org.testng.log, + org.testng.log4testng, + org.testng.reporters, + org.testng.reporters.jq, + org.testng.reporters.util, + org.testng.thread, + org.testng.util, + org.testng.xml, + org.testng.xml.internal diff --git a/Manifests/zero-allocation-hashing-0.15_Manifest.txt b/Manifests/zero-allocation-hashing-0.15_Manifest.txt new file mode 100644 index 0000000..44a286f --- /dev/null +++ b/Manifests/zero-allocation-hashing-0.15_Manifest.txt @@ -0,0 +1,30 @@ +zero-allocation-hashing-0.15.jar + +$ unzip -p zero-allocation-hashing-0.15.jar META-INF/MANIFEST.MF +Manifest-Version: 1.0 +Bnd-LastModified: 1624126699226 +Build-Jdk-Spec: 1.8 +Bundle-Description: Zero-allocation implementations of fast non-crypto + graphic hash functions for byte sequences or blocks of memory +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0 +Bundle-ManifestVersion: 2 +Bundle-Name: OpenHFT :: zero-allocation-hashing +Bundle-SymbolicName: net.openhft.zero-allocation-hashing +Bundle-Version: 0.15 +Created-By: Apache Maven Bundle Plugin +Export-Package: net.openhft.hashing;uses:="javax.annotation";version=" + 0.15.0" +Import-Package: + javax.annotation;version="[3.0,4)", + sun.misc, + sun.nio.ch +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.7))" +Tool: Bnd-5.1.1.202006162103 + + +$ jar --describe-module --file zero-allocation-hashing-0.15.jar +No module descriptor found. Derived automatic module. + [email protected] automatic +requires java.base mandated +contains net.openhft.hashing \ No newline at end of file diff --git a/compile.sh b/compile.sh index adfb25d..af0a6e2 100755 --- a/compile.sh +++ b/compile.sh @@ -51,9 +51,9 @@ $JAVAC \ -d target/test-classes \ $(find src/test/java -name '*.java') -echo " # create datasketches-memory-3.0.0-tests.jar" +echo " # create datasketches-memory-tests-3.0.0.jar" $JAR --create \ - --file libs/datasketches-memory-3.0.0-tests.jar \ + --file libs/datasketches-memory-tests-3.0.0.jar \ -C target/test-classes . diff --git a/libs/datasketches-memory-3.0.0-tests.jar b/libs/datasketches-memory-tests-3.0.0.jar similarity index 100% rename from libs/datasketches-memory-3.0.0-tests.jar rename to libs/datasketches-memory-tests-3.0.0.jar diff --git a/libs/myargfile.txt b/libs/myargfile.txt new file mode 100644 index 0000000..95a686a --- /dev/null +++ b/libs/myargfile.txt @@ -0,0 +1,27 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# -testjar /Users/lrhodes/dev/git/Apache/datasketches-memory17/libs/datasketches-memory-tests-3.0.0.jar +# -verbose:class +# -d test-output +# -testjar /Users/lrhodes/dev/git/Apache/datasketches-memory17/libs/datasketches-memory-tests-3.0.0.jar +# testng.xml + +-cp "/Users/lrhodes/dev/git/Apache/datasketches-memory17/libs/*:/Users/lrhodes/dev/git/Apache/datasketches-memory17/libs/testng-7.8.0.jar" +--add-modules jdk.incubator.foreign +org.testng.TestNG +testng.xml diff --git a/testng.xml b/libs/testng.xml similarity index 93% rename from testng.xml rename to libs/testng.xml index dabfe36..bd48b9d 100644 --- a/testng.xml +++ b/libs/testng.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd";> +<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd"; > <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,8 +20,8 @@ specific language governing permissions and limitations under the License. --> -<suite name="Testing Memory17"> - <test name="Test ALL"> +<suite name="Default suite" guice-stage="DEVELOPMENT"> + <test name="Default test" thread-count="5" verbose="2"> <classes> <class name="org.apache.datasketches.memory.internal.AllocateDirectMapMemoryTest"/> <class name="org.apache.datasketches.memory.internal.AllocateDirectMemoryTest"/> @@ -58,5 +58,5 @@ under the License. <class name="org.apache.datasketches.memory.internal.XxHash64Test"/> <class name="org.apache.datasketches.memory.internal.ZeroCapacityTest"/> </classes> - </test> -</suite> \ No newline at end of file + </test> <!-- Default test --> +</suite> <!-- Default suite --> \ No newline at end of file diff --git a/compile.sh b/runtestng.sh similarity index 52% copy from compile.sh copy to runtestng.sh index adfb25d..4b67e09 100755 --- a/compile.sh +++ b/runtestng.sh @@ -22,38 +22,4 @@ export JAVAC=$JAVA17_HOME/bin/javac export JAR=$JAVA17_HOME/bin/jar export JAVA=$JAVA17_HOME/bin/java -echo "# --- COMPILATION & PACKAGING ---" - -echo " # creating clean directories" -rm -rf target -mkdir target -mkdir target/classes -rm -rf target/test-classes -mkdir target/test-classes -rm -rf mods -mkdir mods -rm -rf libs/datasketches-memory-3.0.0.jar -rm -rf libs/datasketches-memory-3.0.0-tests.jar - -echo " # compile classes from src/main/java" -$JAVAC \ - -d target/classes \ - $(find src/main/java -name '*.java') - -echo " # create jar datasketches-memory-3.0.0.jar from src/main/java" -$JAR --create \ - --file libs/datasketches-memory-3.0.0.jar \ - -C target/classes . - -echo " # compile tests from src/test/java" -$JAVAC \ - --class-path 'libs/*' \ - -d target/test-classes \ - $(find src/test/java -name '*.java') - -echo " # create datasketches-memory-3.0.0-tests.jar" -$JAR --create \ - --file libs/datasketches-memory-3.0.0-tests.jar \ - -C target/test-classes . - - +echo " --- Run TestNG" \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
