aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/resources
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 /src/test/resources
parent7d253e8dc460e1858d5756211f0f16dafd724eae (diff)
downloadsonar-scanner-cli-3091d1bb8bfdb695942afdac41a5fa7c79a8ebc8.tar.gz
sonar-scanner-cli-3091d1bb8bfdb695942afdac41a5fa7c79a8ebc8.zip
SQSCANNER-24 Always consider project.settings, if set
Diffstat (limited to 'src/test/resources')
-rw-r--r--src/test/resources/org/sonarsource/scanner/cli/ConfTest/shouldOverrideProjectSettingsPath/conf/sq-project.properties1
-rw-r--r--src/test/resources/org/sonarsource/scanner/cli/ConfTest/shouldOverrideProjectSettingsPath/sonar-project.properties1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/test/resources/org/sonarsource/scanner/cli/ConfTest/shouldOverrideProjectSettingsPath/conf/sq-project.properties b/src/test/resources/org/sonarsource/scanner/cli/ConfTest/shouldOverrideProjectSettingsPath/conf/sq-project.properties
new file mode 100644
index 0000000..fa1dbbd
--- /dev/null
+++ b/src/test/resources/org/sonarsource/scanner/cli/ConfTest/shouldOverrideProjectSettingsPath/conf/sq-project.properties
@@ -0,0 +1 @@
+sonar.prop=expected
diff --git a/src/test/resources/org/sonarsource/scanner/cli/ConfTest/shouldOverrideProjectSettingsPath/sonar-project.properties b/src/test/resources/org/sonarsource/scanner/cli/ConfTest/shouldOverrideProjectSettingsPath/sonar-project.properties
new file mode 100644
index 0000000..32f39c9
--- /dev/null
+++ b/src/test/resources/org/sonarsource/scanner/cli/ConfTest/shouldOverrideProjectSettingsPath/sonar-project.properties
@@ -0,0 +1 @@
+sonar.prop=default