This is an automated email from the ASF dual-hosted git repository. mmiller pushed a commit to branch 1.10 in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1.10 by this push: new f5121ec Make test scripts clean up duplicate classes f5121ec is described below commit f5121ec42460358eef9d25f5e5ca1914d1842a76 Author: Mike Miller <mmil...@apache.org> AuthorDate: Fri Dec 17 13:23:59 2021 -0500 Make test scripts clean up duplicate classes * The test scripts in start create multiple classes with the same name that can cause problems for IDEs. The classes are only used to create jars for the VFS tests so just drop the intermediate class files when done creating the jars. --- start/src/test/shell/makeHelloWorldJars.sh | 2 ++ start/src/test/shell/makeTestJars.sh | 1 + 2 files changed, 3 insertions(+) diff --git a/start/src/test/shell/makeHelloWorldJars.sh b/start/src/test/shell/makeHelloWorldJars.sh index 9f4a990..53d75bd 100755 --- a/start/src/test/shell/makeHelloWorldJars.sh +++ b/start/src/test/shell/makeHelloWorldJars.sh @@ -19,8 +19,10 @@ mkdir -p target/generated-sources/HelloWorld/test sed "s/%%/Hello World\!/" < src/test/java/test/HelloWorldTemplate > target/generated-sources/HelloWorld/test/HelloWorld.java $JAVA_HOME/bin/javac target/generated-sources/HelloWorld/test/HelloWorld.java -d target/generated-sources/HelloWorld $JAVA_HOME/bin/jar -cf target/test-classes/HelloWorld.jar -C target/generated-sources/HelloWorld test/HelloWorld.class +rm -r target/generated-sources/HelloWorld/test mkdir -p target/generated-sources/HalloWelt/test sed "s/%%/Hallo Welt/" < src/test/java/test/HelloWorldTemplate > target/generated-sources/HalloWelt/test/HelloWorld.java $JAVA_HOME/bin/javac target/generated-sources/HalloWelt/test/HelloWorld.java -d target/generated-sources/HalloWelt $JAVA_HOME/bin/jar -cf target/test-classes/HelloWorld2.jar -C target/generated-sources/HalloWelt test/HelloWorld.class +rm -r target/generated-sources/HalloWelt/test \ No newline at end of file diff --git a/start/src/test/shell/makeTestJars.sh b/start/src/test/shell/makeTestJars.sh index d4dc9fc..539431e 100755 --- a/start/src/test/shell/makeTestJars.sh +++ b/start/src/test/shell/makeTestJars.sh @@ -21,4 +21,5 @@ do sed "s/testX/test$x/" < src/test/java/test/TestTemplate > target/generated-sources/$x/test/TestObject.java $JAVA_HOME/bin/javac -cp target/test-classes target/generated-sources/$x/test/TestObject.java -d target/generated-sources/$x $JAVA_HOME/bin/jar -cf target/test-classes/ClassLoaderTest$x/Test.jar -C target/generated-sources/$x test/TestObject.class + rm -r target/generated-sources/$x done