Repository: cassandra Updated Branches: refs/heads/trunk cf66b7ea2 -> 7a424bc2a
Update Intellij JUnit configuration And other ninja build fixes. patch by Jay Zhuang; reviewed by Stefan Podkowinski for CASSANDRA-14169 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a424bc2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a424bc2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a424bc2 Branch: refs/heads/trunk Commit: 7a424bc2a79dce98817054057dd3a479b202f09e Parents: cf66b7e Author: Jay Zhuang <jay.zhu...@yahoo.com> Authored: Sun Jan 14 21:43:30 2018 -0800 Committer: Stefan Podkowinski <stefan.podkowin...@1und1.de> Committed: Wed Feb 14 16:32:24 2018 +0100 ---------------------------------------------------------------------- build.xml | 5 ----- ide/idea/workspace.xml | 2 +- .../unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a424bc2/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index e04ce18..bc9f0a7 100644 --- a/build.xml +++ b/build.xml @@ -1187,7 +1187,6 @@ <testmacro inputdir="${test.unit.src}" timeout="${test.timeout}"> <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/> <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/> - <jvmarg value="-Dmigration-sstable-root=${test.data}/migration-sstables"/> <jvmarg value="-Dcassandra.ring_delay_ms=1000"/> <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/> <jvmarg value="-Djava.io.tmpdir=${tmp.dir}"/> @@ -1205,7 +1204,6 @@ <testmacrohelper inputdir="${test.unit.src}" filelist="@{test.file.list}" poffset="@{testlist.offset}" exclude="**/*.java" timeout="${test.timeout}"> <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/> <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/> - <jvmarg value="-Dmigration-sstable-root=${test.data}/migration-sstables"/> <jvmarg value="-Dcassandra.ring_delay_ms=1000"/> <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/> <jvmarg value="-Dcassandra.config.loader=org.apache.cassandra.OffsetAwareConfigurationLoader"/> @@ -1225,7 +1223,6 @@ exclude="**/*.java" timeout="${test.timeout}" testtag="compression"> <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/> <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/> - <jvmarg value="-Dmigration-sstable-root=${test.data}/migration-sstables"/> <jvmarg value="-Dcassandra.test.compression=true"/> <jvmarg value="-Dcassandra.ring_delay_ms=1000"/> <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/> @@ -1245,7 +1242,6 @@ exclude="**/*.java" timeout="${test.timeout}" testtag="cdc"> <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/> <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/> - <jvmarg value="-Dmigration-sstable-root=${test.data}/migration-sstables"/> <jvmarg value="-Dcassandra.ring_delay_ms=1000"/> <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/> <jvmarg value="-Dcassandra.config=file:///${cdc_yaml}"/> @@ -1275,7 +1271,6 @@ <test name="${test.name}" methods="${test.methods}"/> <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/> <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/> - <jvmarg value="-Dmigration-sstable-root=${test.data}/migration-sstables"/> <jvmarg value="-Dcassandra.ring_delay_ms=1000"/> <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/> <jvmarg value="-Dcassandra.skip_sync=true" /> http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a424bc2/ide/idea/workspace.xml ---------------------------------------------------------------------- diff --git a/ide/idea/workspace.xml b/ide/idea/workspace.xml index cdde5af..876ed58 100644 --- a/ide/idea/workspace.xml +++ b/ide/idea/workspace.xml @@ -167,7 +167,7 @@ <option name="MAIN_CLASS_NAME" value="" /> <option name="METHOD_NAME" value="" /> <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" value="-Dcassandra.config=file://$PROJECT_DIR$/test/conf/cassandra.yaml -Dlogback.configurationFile=file://$PROJECT_DIR$/test/conf/logback-test.xml -Dcassandra.logdir=$PROJECT_DIR$/build/test/logs -Djava.library.path=$PROJECT_DIR$/lib/sigar-bin -ea" /> + <option name="VM_PARAMETERS" value="-Dcassandra.config=file://$PROJECT_DIR$/test/conf/cassandra.yaml -Dlogback.configurationFile=file://$PROJECT_DIR$/test/conf/logback-test.xml -Dcassandra.logdir=$PROJECT_DIR$/build/test/logs -Djava.library.path=$PROJECT_DIR$/lib/sigar-bin -Dlegacy-sstable-root=$PROJECT_DIR$/test/data/legacy-sstables -Dinvalid-legacy-sstable-root=$PROJECT_DIR$/test/data/invalid-legacy-sstables -Dcassandra.ring_delay_ms=1000 -Dcassandra.skip_sync=true -ea" /> <option name="PARAMETERS" value="" /> <option name="WORKING_DIRECTORY" value="" /> <option name="ENV_VARIABLES" /> http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a424bc2/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java index f669cd7..84f7158 100644 --- a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java @@ -94,7 +94,7 @@ public class LegacySSTableTest public static void defineSchema() throws ConfigurationException { String scp = System.getProperty(LEGACY_SSTABLE_PROP); - Assert.assertNotNull("System property " + LEGACY_SSTABLE_ROOT + " not set", scp); + Assert.assertNotNull("System property " + LEGACY_SSTABLE_PROP + " not set", scp); LEGACY_SSTABLE_ROOT = new File(scp).getAbsoluteFile(); Assert.assertTrue("System property " + LEGACY_SSTABLE_ROOT + " does not specify a directory", LEGACY_SSTABLE_ROOT.isDirectory()); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
