Travis: tests dir cleanup

janmarek · Oct 12, 2014 · 72638c2 · 72638c2
1 parent d26df69
commit 72638c2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ matrix:
     - php: hhvm
 
 before_script:
-  - php tests/prepare-composer.php
+  - php tests/travis/prepare-composer.php
   - composer self-update
   - composer install --no-interaction --prefer-source --dev
   - vendor/bin/parallel-lint -e php --exclude vendor .

diff --git a/tests/composer-nette-2.0.json → tests/travis/composer-nette-2.0.json b/tests/composer-nette-2.0.json → tests/travis/composer-nette-2.0.json
diff --git a/tests/prepare-composer.php → tests/travis/prepare-composer.php b/tests/prepare-composer.php → tests/travis/prepare-composer.php
@@ -1,10 +1,10 @@
 <?php
 
-$rootDir = __DIR__ . '/..';
-$testsDir = __DIR__;
+$rootDir = __DIR__ . '/../..';
+$travisDir = __DIR__;
 
 if (getenv('NETTE') !== 'default') {
-	$composerFile = $testsDir . '/composer-' . getenv('NETTE') . '.json';
+	$composerFile = $travisDir . '/composer-' . getenv('NETTE') . '.json';
 
 	unlink($rootDir . '/composer.json');
 	copy($composerFile, $rootDir . '/composer.json');