update scripts: test kotlin-support module

scripts/common.sh

@@ -130,26 +130,41 @@ mvnCompileTest() {
     fi
 }
 
-readonly dependencies_dir="library/target/dependency"
+readonly core_module_dependencies_dir="library/target/dependency"
+readonly kotlin_support_module_dependencies_dir="kotlin-support/target/dependency"
 
 mvnCopyDependencies() {
-    if [ ! -e "$dependencies_dir" ]; then
+    if [ ! -e "$core_module_dependencies_dir" ]; then
         # https://maven.apache.org/plugins/maven-dependency-plugin/copy-dependencies-mojo.html
         # exclude repackaged and shaded javassist libs
-        runCmd "${MVN_CMD[@]}" dependency:copy-dependencies -DincludeScope=test -DexcludeArtifactIds=javassist,jsr305,spotbugs-annotations || die "fail to mvn copy-dependencies!"
+        runCmd "${MVN_CMD[@]}" dependency:copy-dependencies -DincludeScope=test \
+          -DexcludeArtifactIds=javassist,jsr305,spotbugs-annotations,transmittable-thread-local \
+          || die "fail to mvn copy-dependencies!"
     fi
 }
 
-getClasspathOfDependencies() {
+getCoreModuleClasspathOfDependencies() {
     mvnCopyDependencies 1>&2
 
-    echo "$dependencies_dir"/*.jar | tr ' ' :
+    echo "$core_module_dependencies_dir"/*.jar | tr ' ' :
 }
 
-getClasspathWithoutTtlJar() {
+getKotlinSupportModuleClasspathOfDependencies() {
+    mvnCopyDependencies 1>&2
+
+    echo "$kotlin_support_module_dependencies_dir"/*.jar | tr ' ' :
+}
+
+getCoreModuleClasspathWithoutTtlJar() {
     mvnCompileTest 1>&2
 
-    echo "library/target/test-classes:$(getClasspathOfDependencies)"
+    echo "library/target/test-classes:$(getCoreModuleClasspathOfDependencies)"
+}
+
+getKotlinSupportModuleClasspathWithoutTtlJar() {
+    mvnCompileTest 1>&2
+
+    echo "kotlin-support/target/test-classes:library/target/test-classes:$(getCoreModuleClasspathOfDependencies)"
 }
 
 getTtlJarPath() {
@@ -158,11 +173,15 @@ getTtlJarPath() {
     echo "$ttl_jar"
 }
 
-getClasspath() {
-    echo "$(getTtlJarPath):$(getClasspathWithoutTtlJar)"
+getCoreModuleClasspath() {
+    echo "$(getTtlJarPath):$(getCoreModuleClasspathWithoutTtlJar)"
 }
 
-getJUnitTestCases() {
+getKotlinSupportModuleClasspath() {
+    echo "$(getTtlJarPath):$(getKotlinSupportModuleClasspathWithoutTtlJar)"
+}
+
+getCoreModuleJUnitTestCases() {
     (
         mvnCompileTest 1>&2
 
@@ -175,6 +194,19 @@ getJUnitTestCases() {
     )
 }
 
+getKotlinSupportModuleJUnitTestCases() {
+    (
+        mvnCompileTest 1>&2
+
+        cd kotlin-support/target/test-classes &&
+        find . -iname '*Test.class' | sed '
+                s%^\./%%
+                s/\.class$//
+                s%/%.%g
+            '
+    )
+}
+
 #################################################################################
 # maven actions
 #################################################################################

scripts/perf-test/memoryleak-ThreadLocal.sh

@@ -3,5 +3,5 @@
 cd "$(dirname "$(readlink -f "$0")")"
 source ../common.sh
 
-runCmd "${JAVA_CMD[@]}" -cp "$(getClasspathWithoutTtlJar)" \
+runCmd "${JAVA_CMD[@]}" -cp "$(getCoreModuleClasspathWithoutTtlJar)" \
     com.alibaba.perf.memoryleak.NoMemoryLeak_ThreadLocal_NoRemove

scripts/perf-test/memoryleak-TransmittableThreadLocal.sh

@@ -3,5 +3,5 @@
 cd "$(dirname "$(readlink -f "$0")")"
 source ../common.sh
 
-runCmd "${JAVA_CMD[@]}" -cp "$(getClasspath)" \
+runCmd "${JAVA_CMD[@]}" -cp "$(getCoreModuleClasspath)" \
     com.alibaba.perf.memoryleak.NoMemoryLeak_TransmittableThreadLocal_NoRemove

scripts/perf-test/tps-ThreadLocal.sh

@@ -3,5 +3,5 @@
 cd "$(dirname "$(readlink -f "$0")")"
 source ../common.sh
 
-runCmd "${JAVA_CMD[@]}" -cp "$(getClasspathWithoutTtlJar)" \
+runCmd "${JAVA_CMD[@]}" -cp "$(getCoreModuleClasspathWithoutTtlJar)" \
     com.alibaba.perf.tps.CreateThreadLocalInstanceTps

scripts/perf-test/tps-TransmittableThreadLocal.sh

@@ -3,5 +3,5 @@
 cd "$(dirname "$(readlink -f "$0")")"
 source ../common.sh
 
-runCmd "${JAVA_CMD[@]}" -cp "$(getClasspath)" \
+runCmd "${JAVA_CMD[@]}" -cp "$(getCoreModuleClasspath)" \
     com.alibaba.perf.tps.CreateTransmittableThreadLocalInstanceTps

scripts/run-agent-demo.sh

@@ -3,6 +3,6 @@
 cd "$(dirname "$(readlink -f "$0")")"
 source ./common.sh
 
-runCmd "${JAVA_CMD[@]}" -cp "$(getClasspathWithoutTtlJar)" \
+runCmd "${JAVA_CMD[@]}" -cp "$(getCoreModuleClasspathWithoutTtlJar)" \
     "-javaagent:$(getTtlJarPath)=ttl.agent.logger:STDOUT" \
     com.alibaba.demo.ttl.agent.AgentDemo

scripts/run-agent-for-class.sh

@@ -7,6 +7,6 @@ shift 1
 cd "$(dirname "$(readlink -f "$0")")"
 source ./common.sh
 
-runCmd "${JAVA_CMD[@]}" -cp "$(getClasspathWithoutTtlJar)" \
+runCmd "${JAVA_CMD[@]}" -cp "$(getCoreModuleClasspathWithoutTtlJar)" \
     "-javaagent:$(getTtlJarPath)=ttl.agent.logger:STDOUT" \
      "$run_class_name"

scripts/run-agent-test.sh

@@ -9,24 +9,30 @@ source ./common.sh
 runCmd mvnBuildJar
 
 blueEcho "Run unit test under ttl agent, include check for ExecutorService, ForkJoinPool"
-runCmd "${JAVA_CMD[@]}" -cp "$(getClasspathWithoutTtlJar)" \
+runCmd "${JAVA_CMD[@]}" -cp "$(getCoreModuleClasspathWithoutTtlJar)" \
     "-javaagent:$(getTtlJarPath)=ttl.agent.logger:STDOUT" \
     -Drun-ttl-test-under-agent=true \
-    org.junit.runner.JUnitCore $(getJUnitTestCases)
+    org.junit.runner.JUnitCore $(getCoreModuleJUnitTestCases)
 
 blueEcho "Run unit test under ttl agent, and turn on the disable inheritable for thread pool enhancement"
-runCmd "${JAVA_CMD[@]}" -cp "$(getClasspathWithoutTtlJar)" \
+runCmd "${JAVA_CMD[@]}" -cp "$(getCoreModuleClasspathWithoutTtlJar)" \
     "-javaagent:$(getTtlJarPath)=ttl.agent.logger:STDOUT,ttl.agent.disable.inheritable.for.thread.pool:true" \
     -Drun-ttl-test-under-agent=true \
     -Drun-ttl-test-under-agent-with-disable-inheritable=true \
-    org.junit.runner.JUnitCore $(getJUnitTestCases)
+    org.junit.runner.JUnitCore $(getCoreModuleJUnitTestCases)
 
 blueEcho 'Run agent check for Timer/TimerTask, default "ttl.agent.enable.timer.task"'
-runCmd "${JAVA_CMD[@]}" -cp "$(getClasspathWithoutTtlJar)" \
+runCmd "${JAVA_CMD[@]}" -cp "$(getCoreModuleClasspathWithoutTtlJar)" \
     "-javaagent:$(getTtlJarPath)=ttl.agent.logger:STDOUT" \
     com.alibaba.ttl.threadpool.agent.check.timer.TimerAgentCheck
 
 blueEcho "Run agent check for Timer/TimerTask, explicit "ttl.agent.enable.timer.task""
-runCmd "${JAVA_CMD[@]}" -cp "$(getClasspathWithoutTtlJar)" \
+runCmd "${JAVA_CMD[@]}" -cp "$(getCoreModuleClasspathWithoutTtlJar)" \
     "-javaagent:$(getTtlJarPath)=ttl.agent.logger:STDOUT,ttl.agent.enable.timer.task:true" \
     com.alibaba.ttl.threadpool.agent.check.timer.TimerAgentCheck
+
+blueEcho "Run unit test under ttl agent, check for Koroutine"
+runCmd "${JAVA_CMD[@]}" -cp "$(getKotlinSupportModuleClasspathWithoutTtlJar)" \
+    "-javaagent:$(getTtlJarPath)=ttl.agent.logger:STDOUT" \
+    -Drun-ttl-test-under-agent=true \
+    org.junit.runner.JUnitCore $(getKotlinSupportModuleJUnitTestCases)

scripts/run-junit.sh

@@ -5,6 +5,11 @@ cd "$(dirname "$(readlink -f "$0")")"
 export TTL_CI_TEST_MODE=true
 source ./common.sh
 
+# run junit test for core module
 # skip unit test for Javassist on command line, because Javassist is repackaged.
-runCmd "${JAVA_CMD[@]}" -cp "$(getClasspath)" \
-    org.junit.runner.JUnitCore $(getJUnitTestCases | grep -vE '\.JavassistTest$')
+runCmd "${JAVA_CMD[@]}" -cp "$(getCoreModuleClasspath)" \
+    org.junit.runner.JUnitCore $(getCoreModuleJUnitTestCases | grep -vE '\.JavassistTest$')
+
+# run junit test for kotlin-support module
+runCmd "${JAVA_CMD[@]}" -cp "$(getKotlinSupportModuleClasspath)" \
+    org.junit.runner.JUnitCore $(getKotlinSupportModuleJUnitTestCases)