aboutsummaryrefslogtreecommitdiffstats
path: root/it/src
diff options
context:
space:
mode:
authorJulien HENRY <julien.henry@sonarsource.com>2019-09-03 15:36:13 +0200
committerJulien HENRY <julien.henry@sonarsource.com>2019-09-05 10:03:19 +0200
commit3091d1bb8bfdb695942afdac41a5fa7c79a8ebc8 (patch)
treef3635ce9877ea9384b340d6f6adffee62b8d57ec /it/src
parent7d253e8dc460e1858d5756211f0f16dafd724eae (diff)
downloadsonar-scanner-cli-3091d1bb8bfdb695942afdac41a5fa7c79a8ebc8.tar.gz
sonar-scanner-cli-3091d1bb8bfdb695942afdac41a5fa7c79a8ebc8.zip
SQSCANNER-24 Always consider project.settings, if set
Diffstat (limited to 'it/src')
-rw-r--r--it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java b/it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java
index f003df2..c0c2875 100644
--- a/it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java
+++ b/it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java
@@ -198,4 +198,15 @@ public class ScannerTest extends ScannerTestCase {
assertThat(logs).containsPattern("Too small (initial|maximum) heap");
}
+ // SQSCANNER-24
+ @Test
+ public void should_override_project_settings_path() {
+ File projectHome = new File("projects/override-project-settings-path");
+ SonarScanner build = newScanner(projectHome)
+ .setProperty("project.settings", new File(projectHome, "conf/sq-project.properties").getAbsolutePath());
+ orchestrator.executeBuild(build);
+
+ assertThat(getComponent("sample-with-custom-settings-path").getName()).isEqualTo("Test with custom settings location");
+ }
+
}