Use Dex suffix instead of dex prefix for better test sorting

(cherry picked from commit 7f3a9c1)
This commit is contained in:
Nikolay Krasko
2016-10-13 00:49:23 +03:00
committed by Nikolay Krasko
parent 2511ef2c45
commit fe901e9516
40 changed files with 183 additions and 198 deletions
@@ -1,23 +0,0 @@
LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:5
LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:23
LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:29
LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:34
LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:41
LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:46
LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:53
LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:60
LineBreakpoint created at dexSeveralInlineFunctionsInOneFile.kt:66
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexSeveralInlineFunctionsInOneFile.DexSeveralInlineFunctionsInOneFileKt
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
dexSeveralInlineFunctionsInOneFile.kt:5
dexSeveralInlineFunctionsInOneFile.kt:23
dexSeveralInlineFunctionsInOneFile.kt:29
dexSeveralInlineFunctionsInOneFile.kt:41
dexSeveralInlineFunctionsInOneFile.kt:66
dexSeveralInlineFunctionsInOneFile.kt:34
dexSeveralInlineFunctionsInOneFile.kt:46
dexSeveralInlineFunctionsInOneFile.kt:53
dexSeveralInlineFunctionsInOneFile.kt:60
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 0
@@ -1,8 +0,0 @@
LineBreakpoint created at dexStopInInlineInOtherFile.Other.kt:6
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexStopInInlineInOtherFile.DexStopInInlineInOtherFileKt
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
dexStopInInlineInOtherFile.Other.kt:6
dexStopInInlineInOtherFile.Other.kt:7
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 0
@@ -1,8 +1,8 @@
LineBreakpoint created at dexInline.kt:5
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexInline.DexInlineKt
LineBreakpoint created at inlineDex.kt:5
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineDex.InlineDexKt
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
dexInline.kt:5
dexInline.kt:9
inlineDex.kt:5
inlineDex.kt:9
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 0
@@ -1,8 +1,8 @@
LineBreakpoint created at dexInlineInClass.Other.kt:6
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexInlineInClass.DexInlineInClassKt
LineBreakpoint created at inlineInClassDex.Other.kt:6
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineInClassDex.InlineInClassDexKt
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
dexInlineInClass.Other.kt:6
dexInlineInClass.Other.kt:7
inlineInClassDex.Other.kt:6
inlineInClassDex.Other.kt:7
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 0
@@ -1,8 +1,8 @@
LineBreakpoint created at dexInlineInObject.Other.kt:6
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexInlineInObject.DexInlineInObjectKt
LineBreakpoint created at inlineInObjectDex.Other.kt:6
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineInObjectDex.InlineInObjectDexKt
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
dexInlineInObject.Other.kt:6
dexInlineInObject.Other.kt:7
inlineInObjectDex.Other.kt:6
inlineInObjectDex.Other.kt:7
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 0
@@ -1,9 +1,9 @@
LineBreakpoint created at dexInlineInObjectSameFile.kt:5
LineBreakpoint created at dexInlineInObjectSameFile.kt:11
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexInlineInObjectSameFile.DexInlineInObjectSameFileKt
LineBreakpoint created at inlineInObjectSameFileDex.kt:5
LineBreakpoint created at inlineInObjectSameFileDex.kt:11
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineInObjectSameFileDex.InlineInObjectSameFileDexKt
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
dexInlineInObjectSameFile.kt:5
dexInlineInObjectSameFile.kt:11
inlineInObjectSameFileDex.kt:5
inlineInObjectSameFileDex.kt:11
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 0
@@ -1,7 +1,7 @@
LineBreakpoint created at dexManyFilesWithInlineCalls1.First.kt:5
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexManyFilesWithInlineCalls1.DexManyFilesWithInlineCalls1Kt
LineBreakpoint created at manyFilesWithInlineCalls1Dex.First.kt:5
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! manyFilesWithInlineCalls1Dex.ManyFilesWithInlineCalls1DexKt
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
dexManyFilesWithInlineCalls1.First.kt:5
manyFilesWithInlineCalls1Dex.First.kt:5
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 0
@@ -1,7 +1,7 @@
LineBreakpoint created at dexManyFilesWithInlineCalls2.Second.kt:5
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexManyFilesWithInlineCalls2.DexManyFilesWithInlineCalls2Kt
LineBreakpoint created at manyFilesWithInlineCalls2Dex.Second.kt:5
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! manyFilesWithInlineCalls2Dex.ManyFilesWithInlineCalls2DexKt
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
dexManyFilesWithInlineCalls2.Second.kt:5
manyFilesWithInlineCalls2Dex.Second.kt:5
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 0
@@ -1,10 +1,10 @@
LineBreakpoint created at dexSeveralInlineCallsFromOtherFile.Other.kt:6
LineBreakpoint created at dexSeveralInlineCallsFromOtherFile.kt:5
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexSeveralInlineCallsFromOtherFile.DexSeveralInlineCallsFromOtherFileKt
LineBreakpoint created at severalInlineCallsFromOtherFileDex.Other.kt:6
LineBreakpoint created at severalInlineCallsFromOtherFileDex.kt:5
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! severalInlineCallsFromOtherFileDex.SeveralInlineCallsFromOtherFileDexKt
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
dexSeveralInlineCallsFromOtherFile.kt:5
dexSeveralInlineCallsFromOtherFile.Other.kt:6
dexSeveralInlineCallsFromOtherFile.Other.kt:6
severalInlineCallsFromOtherFileDex.kt:5
severalInlineCallsFromOtherFileDex.Other.kt:6
severalInlineCallsFromOtherFileDex.Other.kt:6
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 0
@@ -0,0 +1,6 @@
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! severalInlineFunctionsInOneFileDex.SeveralInlineFunctionsInOneFileDexKt
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 1
Error: Could not find or load main class severalInlineFunctionsInOneFileDex.SeveralInlineFunctionsInOneFileDexKt
@@ -1,8 +1,8 @@
LineBreakpoint created at dexStopInInlineFun.kt:10
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dexStopInInlineFun.DexStopInInlineFunKt
LineBreakpoint created at stopInInlineFunDex.kt:10
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlineFunDex.StopInInlineFunDexKt
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
dexStopInInlineFun.kt:10
dexStopInInlineFun.kt:11
stopInInlineFunDex.kt:10
stopInInlineFunDex.kt:11
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 0
@@ -0,0 +1,8 @@
LineBreakpoint created at stopInInlineInOtherFileDex.Other.kt:6
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInInlineInOtherFileDex.StopInInlineInOtherFileDexKt
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
stopInInlineInOtherFileDex.Other.kt:6
stopInInlineInOtherFileDex.Other.kt:7
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
Process finished with exit code 0
@@ -1,5 +0,0 @@
package dexManyFilesWithInlineCalls1.second
inline fun secondInline() {
1 + 1
}
@@ -1,14 +0,0 @@
package dexManyFilesWithInlineCalls1
import dexManyFilesWithInlineCalls1.first.*
import dexManyFilesWithInlineCalls1.second.*
fun main(args: Array<String>) {
firstInline()
}
fun unused() {
secondInline()
}
// ADDITIONAL_BREAKPOINT: dexManyFilesWithInlineCalls1.First.kt: Breakpoint 1
@@ -1,5 +0,0 @@
package dexManyFilesWithInlineCalls2.first
inline fun firstInline() {
1 + 1
}
@@ -1,14 +0,0 @@
package dexManyFilesWithInlineCalls2
import dexManyFilesWithInlineCalls2.first.*
import dexManyFilesWithInlineCalls2.second.*
fun main(args: Array<String>) {
secondInline()
}
fun unused() {
firstInline()
}
// ADDITIONAL_BREAKPOINT: dexManyFilesWithInlineCalls2.Second.kt: Breakpoint 1
@@ -1,4 +1,4 @@
package dexInlineInObjectSameFile
package inlineInObjectSameFileDex
fun main(args: Array<String>) {
//Breakpoint!
@@ -1,4 +1,4 @@
package dexManyFilesWithInlineCalls1.first
package manyFilesWithInlineCalls1Dex.first
inline fun firstInline() {
// Breakpoint 1
@@ -0,0 +1,5 @@
package manyFilesWithInlineCalls1Dex.second
inline fun secondInline() {
1 + 1
}
@@ -0,0 +1,14 @@
package manyFilesWithInlineCalls1Dex
import manyFilesWithInlineCalls1Dex.first.*
import manyFilesWithInlineCalls1Dex.second.*
fun main(args: Array<String>) {
firstInline()
}
fun unused() {
secondInline()
}
// ADDITIONAL_BREAKPOINT: manyFilesWithInlineCalls1Dex.First.kt: Breakpoint 1
@@ -0,0 +1,5 @@
package manyFilesWithInlineCalls2Dex.first
inline fun firstInline() {
1 + 1
}
@@ -1,4 +1,4 @@
package dexManyFilesWithInlineCalls2.second
package manyFilesWithInlineCalls2Dex.second
inline fun secondInline() {
// Breakpoint 1
@@ -0,0 +1,14 @@
package manyFilesWithInlineCalls2Dex
import manyFilesWithInlineCalls2Dex.first.*
import manyFilesWithInlineCalls2Dex.second.*
fun main(args: Array<String>) {
secondInline()
}
fun unused() {
firstInline()
}
// ADDITIONAL_BREAKPOINT: manyFilesWithInlineCalls2Dex.Second.kt: Breakpoint 1
@@ -1,4 +1,4 @@
package dexSeveralInlineCallsFromOtherFile
package severalInlineCallsFromOtherFileDex
inline fun inlineFun() {
var i = 1
@@ -1,4 +1,4 @@
package dexSeveralInlineCallsFromOtherFile
package severalInlineCallsFromOtherFileDex
fun main(args: Array<String>) {
//Breakpoint!
@@ -15,4 +15,4 @@ fun secondCall() {
}
// RESUME: 2
// ADDITIONAL_BREAKPOINT: dexSeveralInlineCallsFromOtherFile.Other.kt: Breakpoint 1
// ADDITIONAL_BREAKPOINT: severalInlineCallsFromOtherFileDex.Other.kt: Breakpoint 1
@@ -1,4 +1,4 @@
package dexSeveralInlineFunctionsInOneFile
package severalInlineCallsFromOtherFileDex
fun main(args: Array<String>) {
//Breakpoint!
@@ -1,4 +1,4 @@
package dexInline
package inlineDex
fun main(args: Array<String>) {
//Breakpoint!
@@ -1,7 +0,0 @@
package dexInlineInClass
fun main(args: Array<String>) {
dexInlineInClass.other.TestDexInlineInClass().inlineFun()
}
// ADDITIONAL_BREAKPOINT: dexInlineInClass.Other.kt: Breakpoint 1
@@ -1,7 +0,0 @@
package dexInlineInObject
fun main(args: Array<String>) {
dexInlineInObject.other.TestDexInlineInObject.inlineFun()
}
// ADDITIONAL_BREAKPOINT: dexInlineInObject.Other.kt: Breakpoint 1
@@ -1,7 +0,0 @@
package dexStopInInlineInOtherFile
fun main(args: Array<String>) {
inlineFun()
}
// ADDITIONAL_BREAKPOINT: dexStopInInlineInOtherFile.Other.kt: Breakpoint 1
@@ -1,4 +1,4 @@
package dexInlineInClass.other
package inlineInClassDex.other
class TestDexInlineInClass {
inline fun inlineFun() {
@@ -0,0 +1,7 @@
package inlineInClassDex
fun main(args: Array<String>) {
inlineInClassDex.other.TestDexInlineInClass().inlineFun()
}
// ADDITIONAL_BREAKPOINT: inlineInClassDex.Other.kt: Breakpoint 1
@@ -1,4 +1,4 @@
package dexInlineInObject.other
package inlineInObjectDex.other
object TestDexInlineInObject {
inline fun inlineFun() {
@@ -0,0 +1,7 @@
package inlineInObjectDex
fun main(args: Array<String>) {
inlineInObjectDex.other.TestDexInlineInObject.inlineFun()
}
// ADDITIONAL_BREAKPOINT: inlineInObjectDex.Other.kt: Breakpoint 1
@@ -1,4 +1,4 @@
package dexStopInInlineFun
package stopInInlineFunDex
fun main(args: Array<String>) {
inlineFun()
@@ -1,4 +1,4 @@
package dexStopInInlineInOtherFile
package stopInInlineInOtherFileDex
inline fun inlineFun() {
var i = 1
@@ -0,0 +1,7 @@
package stopInInlineInOtherFileDex
fun main(args: Array<String>) {
inlineFun()
}
// ADDITIONAL_BREAKPOINT: stopInInlineInOtherFileDex.Other.kt: Breakpoint 1