From 9eb1a38a256b2723a648d2752421597413c910f9 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 1 Oct 2014 15:35:40 +0400 Subject: [PATCH] Don't rewrite testData file if content not changed, it's for windows family. And improved some error messages. --- .../tests/generateTestDataForReservedWords.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/generators/src/org/jetbrains/jet/generators/tests/generateTestDataForReservedWords.kt b/generators/src/org/jetbrains/jet/generators/tests/generateTestDataForReservedWords.kt index 042911b2b74..2ccedaeca58 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/generateTestDataForReservedWords.kt +++ b/generators/src/org/jetbrains/jet/generators/tests/generateTestDataForReservedWords.kt @@ -19,6 +19,7 @@ package org.jetbrains.jet.generators.tests.reservedWords import java.io.File import org.jetbrains.jet.renderer.KeywordStringsGenerated import com.google.dart.compiler.backend.js.ast.JsFunctionScope +import org.jetbrains.jet.di.GeneratorsFileUtil.writeFileIfContentChanged val commonCases: CaseBuilder.(String, String) -> Unit = { (testByName, testByRef) -> case("val", "val $KEYWORD_MARKER: Int", " = 0", testByName) @@ -287,9 +288,15 @@ class TestDataBuilder() { val testDataFile = File(testDataDirPath + "/" + fileName) - assert(isCreatingFromScratch xor testDataFile.exists(), "Unexpected file name: $fileName") + if (testDataFile.exists()) { + if (isCreatingFromScratch) { + error("The file '$fileName' unexpectedly exists when create test data from scratch.") + } + } else if (!isCreatingFromScratch) { + error("Unexpected new testdata file: '$fileName'. It may cause for example because of bug in stdlib.") + } - testDataFile.writeText(out) + writeFileIfContentChanged(testDataFile, out, false) } } }