aboutsummaryrefslogtreecommitdiffstats
path: root/it/projects
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/projects
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/projects')
-rw-r--r--it/projects/override-project-settings-path/conf/sq-project.properties4
-rw-r--r--it/projects/override-project-settings-path/sonar-project.properties4
-rw-r--r--it/projects/override-project-settings-path/src/basic/Hello.js2
-rw-r--r--it/projects/override-project-settings-path/src/basic/World.js2
4 files changed, 12 insertions, 0 deletions
diff --git a/it/projects/override-project-settings-path/conf/sq-project.properties b/it/projects/override-project-settings-path/conf/sq-project.properties
new file mode 100644
index 0000000..a3b76fd
--- /dev/null
+++ b/it/projects/override-project-settings-path/conf/sq-project.properties
@@ -0,0 +1,4 @@
+sonar.projectKey=sample-with-custom-settings-path
+sonar.projectName=Test with custom settings location
+
+sonar.sources=src
diff --git a/it/projects/override-project-settings-path/sonar-project.properties b/it/projects/override-project-settings-path/sonar-project.properties
new file mode 100644
index 0000000..bd982e4
--- /dev/null
+++ b/it/projects/override-project-settings-path/sonar-project.properties
@@ -0,0 +1,4 @@
+sonar.projectKey=sample-should-be-ignored
+sonar.projectName=Should be ignored
+
+sonar.sources=src
diff --git a/it/projects/override-project-settings-path/src/basic/Hello.js b/it/projects/override-project-settings-path/src/basic/Hello.js
new file mode 100644
index 0000000..fd35455
--- /dev/null
+++ b/it/projects/override-project-settings-path/src/basic/Hello.js
@@ -0,0 +1,2 @@
+function hello() {
+}
diff --git a/it/projects/override-project-settings-path/src/basic/World.js b/it/projects/override-project-settings-path/src/basic/World.js
new file mode 100644
index 0000000..1ea849a
--- /dev/null
+++ b/it/projects/override-project-settings-path/src/basic/World.js
@@ -0,0 +1,2 @@
+function world() {
+}