aboutsummaryrefslogtreecommitdiff
path: root/tests/data
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-01-18 22:30:36 +0100
committerPetr Mrázek <peterix@gmail.com>2014-01-18 22:30:36 +0100
commit50c441a7735bc7910db345c846adccc049d89170 (patch)
tree773bdde1a290224d7616a4ff9ef9709232e69cce /tests/data
parente9186d6d2c9d5e08516d6a3126440f89e55d056b (diff)
parent7d76fd57e99e686d59f48038e7b762e4064996d1 (diff)
downloadPrismLauncher-50c441a7735bc7910db345c846adccc049d89170.tar.gz
PrismLauncher-50c441a7735bc7910db345c846adccc049d89170.tar.bz2
PrismLauncher-50c441a7735bc7910db345c846adccc049d89170.zip
Merge branch 'fix_tests' of https://github.com/02JanDal/MultiMC5 into develop
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",