aboutsummaryrefslogtreecommitdiff
path: root/tests/data
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-01-20 01:32:38 +0100
committerPetr Mrázek <peterix@gmail.com>2014-01-20 01:32:38 +0100
commit222d3c0dc5a8b8a9e93b9368e964cda7becc7f02 (patch)
tree9ab4538f2e80847874a7c9a5c7c2dbc099cb8cae /tests/data
parent48b587e7b6b96b5c3ac17dc8b67a7b0ab9c2c4f0 (diff)
parent3a3c9ac9515447941d383f2c4fe4b0225fdd8252 (diff)
downloadPrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.tar.gz
PrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.tar.bz2
PrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.zip
Merge branch 'release-0.2'
Diffstat (limited to 'tests/data')
-rw-r--r--tests/data/1.json6
-rw-r--r--tests/data/2.json4
-rw-r--r--tests/data/channels.json4
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/data/1.json b/tests/data/1.json
index f9f99b22..0f2d6ced 100644
--- a/tests/data/1.json
+++ b/tests/data/1.json
@@ -8,7 +8,7 @@
"Sources": [
{
"SourceType": "http",
- "Url": "$PWD/tests/data/fileOneA"
+ "Url": "@MultiMC_TEST_DATA_PATH@/fileOneA"
}
],
"Executable": true,
@@ -20,7 +20,7 @@
"Sources": [
{
"SourceType": "http",
- "Url": "$PWD/tests/data/fileTwo"
+ "Url": "@MultiMC_TEST_DATA_PATH@/fileTwo"
}
],
"Executable": false,
@@ -32,7 +32,7 @@
"Sources": [
{
"SourceType": "http",
- "Url": "$PWD/tests/data/fileThree"
+ "Url": "@MultiMC_TEST_DATA_PATH@/fileThree"
}
],
"Executable": false,
diff --git a/tests/data/2.json b/tests/data/2.json
index bb59b9b6..6e2b0d3c 100644
--- a/tests/data/2.json
+++ b/tests/data/2.json
@@ -8,7 +8,7 @@
"Sources": [
{
"SourceType": "http",
- "Url": "$PWD/tests/data/fileOneB"
+ "Url": "@MultiMC_TEST_DATA_PATH@/fileOneB"
}
],
"Executable": true,
@@ -20,7 +20,7 @@
"Sources": [
{
"SourceType": "http",
- "Url": "$PWD/tests/data/fileTwo"
+ "Url": "@MultiMC_TEST_DATA_PATH@/fileTwo"
}
],
"Executable": false,
diff --git a/tests/data/channels.json b/tests/data/channels.json
index d7446274..3ad504b0 100644
--- a/tests/data/channels.json
+++ b/tests/data/channels.json
@@ -5,13 +5,13 @@
"id": "develop",
"name": "Develop",
"description": "The channel called \"develop\"",
- "url": "$PWD/tests/data/"
+ "url": "@MultiMC_TEST_DATA_PATH@"
},
{
"id": "stable",
"name": "Stable",
"description": "It's stable at least",
- "url": "$PWD/tests/data/"
+ "url": "@MultiMC_TEST_DATA_PATH@"
},
{
"id": "42",