From 37da154ea2fe41f3aa269fcabc8fa79e7820342b Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 4 Feb 2015 13:50:32 +0300 Subject: [PATCH] Minor, move builtins serializer test data --- .../{ => builtinsSerializer}/annotationArguments/annotation.kt | 0 .../{ => builtinsSerializer}/annotationArguments/annotation.txt | 0 .../{ => builtinsSerializer}/annotationArguments/enum.kt | 0 .../{ => builtinsSerializer}/annotationArguments/enum.txt | 0 .../annotationArguments/primitiveArrays.kt | 0 .../annotationArguments/primitiveArrays.txt | 0 .../{ => builtinsSerializer}/annotationArguments/primitives.kt | 0 .../{ => builtinsSerializer}/annotationArguments/primitives.txt | 0 .../{ => builtinsSerializer}/annotationArguments/string.kt | 0 .../{ => builtinsSerializer}/annotationArguments/string.txt | 0 .../serialization/{ => builtinsSerializer}/annotationTargets.kt | 0 .../{ => builtinsSerializer}/annotationTargets.txt | 0 .../{ => builtinsSerializer}/compileTimeConstants.kt | 0 .../{ => builtinsSerializer}/compileTimeConstants.txt | 0 .../testData/serialization/{ => builtinsSerializer}/simple.kt | 0 .../testData/serialization/{ => builtinsSerializer}/simple.txt | 0 .../kotlin/serialization/builtins/BuiltInsSerializerTest.kt | 2 +- 17 files changed, 1 insertion(+), 1 deletion(-) rename compiler/testData/serialization/{ => builtinsSerializer}/annotationArguments/annotation.kt (100%) rename compiler/testData/serialization/{ => builtinsSerializer}/annotationArguments/annotation.txt (100%) rename compiler/testData/serialization/{ => builtinsSerializer}/annotationArguments/enum.kt (100%) rename compiler/testData/serialization/{ => builtinsSerializer}/annotationArguments/enum.txt (100%) rename compiler/testData/serialization/{ => builtinsSerializer}/annotationArguments/primitiveArrays.kt (100%) rename compiler/testData/serialization/{ => builtinsSerializer}/annotationArguments/primitiveArrays.txt (100%) rename compiler/testData/serialization/{ => builtinsSerializer}/annotationArguments/primitives.kt (100%) rename compiler/testData/serialization/{ => builtinsSerializer}/annotationArguments/primitives.txt (100%) rename compiler/testData/serialization/{ => builtinsSerializer}/annotationArguments/string.kt (100%) rename compiler/testData/serialization/{ => builtinsSerializer}/annotationArguments/string.txt (100%) rename compiler/testData/serialization/{ => builtinsSerializer}/annotationTargets.kt (100%) rename compiler/testData/serialization/{ => builtinsSerializer}/annotationTargets.txt (100%) rename compiler/testData/serialization/{ => builtinsSerializer}/compileTimeConstants.kt (100%) rename compiler/testData/serialization/{ => builtinsSerializer}/compileTimeConstants.txt (100%) rename compiler/testData/serialization/{ => builtinsSerializer}/simple.kt (100%) rename compiler/testData/serialization/{ => builtinsSerializer}/simple.txt (100%) diff --git a/compiler/testData/serialization/annotationArguments/annotation.kt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.kt similarity index 100% rename from compiler/testData/serialization/annotationArguments/annotation.kt rename to compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.kt diff --git a/compiler/testData/serialization/annotationArguments/annotation.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.txt similarity index 100% rename from compiler/testData/serialization/annotationArguments/annotation.txt rename to compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.txt diff --git a/compiler/testData/serialization/annotationArguments/enum.kt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.kt similarity index 100% rename from compiler/testData/serialization/annotationArguments/enum.kt rename to compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.kt diff --git a/compiler/testData/serialization/annotationArguments/enum.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt similarity index 100% rename from compiler/testData/serialization/annotationArguments/enum.txt rename to compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt diff --git a/compiler/testData/serialization/annotationArguments/primitiveArrays.kt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.kt similarity index 100% rename from compiler/testData/serialization/annotationArguments/primitiveArrays.kt rename to compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.kt diff --git a/compiler/testData/serialization/annotationArguments/primitiveArrays.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.txt similarity index 100% rename from compiler/testData/serialization/annotationArguments/primitiveArrays.txt rename to compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.txt diff --git a/compiler/testData/serialization/annotationArguments/primitives.kt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitives.kt similarity index 100% rename from compiler/testData/serialization/annotationArguments/primitives.kt rename to compiler/testData/serialization/builtinsSerializer/annotationArguments/primitives.kt diff --git a/compiler/testData/serialization/annotationArguments/primitives.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitives.txt similarity index 100% rename from compiler/testData/serialization/annotationArguments/primitives.txt rename to compiler/testData/serialization/builtinsSerializer/annotationArguments/primitives.txt diff --git a/compiler/testData/serialization/annotationArguments/string.kt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/string.kt similarity index 100% rename from compiler/testData/serialization/annotationArguments/string.kt rename to compiler/testData/serialization/builtinsSerializer/annotationArguments/string.kt diff --git a/compiler/testData/serialization/annotationArguments/string.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/string.txt similarity index 100% rename from compiler/testData/serialization/annotationArguments/string.txt rename to compiler/testData/serialization/builtinsSerializer/annotationArguments/string.txt diff --git a/compiler/testData/serialization/annotationTargets.kt b/compiler/testData/serialization/builtinsSerializer/annotationTargets.kt similarity index 100% rename from compiler/testData/serialization/annotationTargets.kt rename to compiler/testData/serialization/builtinsSerializer/annotationTargets.kt diff --git a/compiler/testData/serialization/annotationTargets.txt b/compiler/testData/serialization/builtinsSerializer/annotationTargets.txt similarity index 100% rename from compiler/testData/serialization/annotationTargets.txt rename to compiler/testData/serialization/builtinsSerializer/annotationTargets.txt diff --git a/compiler/testData/serialization/compileTimeConstants.kt b/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.kt similarity index 100% rename from compiler/testData/serialization/compileTimeConstants.kt rename to compiler/testData/serialization/builtinsSerializer/compileTimeConstants.kt diff --git a/compiler/testData/serialization/compileTimeConstants.txt b/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt similarity index 100% rename from compiler/testData/serialization/compileTimeConstants.txt rename to compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt diff --git a/compiler/testData/serialization/simple.kt b/compiler/testData/serialization/builtinsSerializer/simple.kt similarity index 100% rename from compiler/testData/serialization/simple.kt rename to compiler/testData/serialization/builtinsSerializer/simple.kt diff --git a/compiler/testData/serialization/simple.txt b/compiler/testData/serialization/builtinsSerializer/simple.txt similarity index 100% rename from compiler/testData/serialization/simple.txt rename to compiler/testData/serialization/builtinsSerializer/simple.txt diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt index cf32edb4b90..3a424c992e6 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME public class BuiltInsSerializerTest : TestCaseWithTmpdir() { private fun doTest(fileName: String) { - val source = "compiler/testData/serialization/$fileName" + val source = "compiler/testData/serialization/builtinsSerializer/$fileName" BuiltInsSerializer(dependOnOldBuiltIns = true).serialize( tmpdir, srcDirs = listOf(File(source)),