From a86e66b9d8f5e7959635d8dfaf9b6d3c399fe241 Mon Sep 17 00:00:00 2001
From: Sean Madsen <sean@seanmadsen.com>
Date: Tue, 12 Sep 2017 11:16:08 -0600
Subject: [PATCH] Point readers to civi-test-run page from elsewhere
---
docs/testing/continuous-integration.md | 4 ++++
docs/testing/javascript.md | 6 +-----
docs/testing/phpunit.md | 13 +------------
docs/testing/upgrades.md | 8 +-------
4 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/docs/testing/continuous-integration.md b/docs/testing/continuous-integration.md
index b9a48a0e..b066382c 100644
--- a/docs/testing/continuous-integration.md
+++ b/docs/testing/continuous-integration.md
@@ -35,5 +35,9 @@ codebase.
Code-style is not checked on this build, but all upgrade and web tests are run.
+## Running the test suite locally
+
+You can use [civi-test-run](/tools/civi-test-run.md) locally to run a full standard CiviCRM Test suite.
+
[jenkins-test-results]: https://test.civicrm.org/
[testing-readme]: https://github.com/civicrm/civicrm-core/blob/master/tests/README.md
diff --git a/docs/testing/javascript.md b/docs/testing/javascript.md
index eab9ba1b..52ff965b 100644
--- a/docs/testing/javascript.md
+++ b/docs/testing/javascript.md
@@ -14,11 +14,7 @@ $ cd /path/to/civicrm
$ npm test
```
-You can also run the karama tests as they would be run by Jenkins using the `civi-test-run` command
-
-```bash
-$ civi-test-run "<buildname>" "<civicrm version>" "<junitdir>" "karma"
-```
+You can also run the karama tests as they would be run by [Jenkins](/testing/continuous-integration.md) using [civi-test-run](/tools/civi-test-run.md).
[karma]: https://karma-runner.github.io/1.0/index.html
[jasmine]: https://jasmine.github.io/2.1/introduction.html
diff --git a/docs/testing/phpunit.md b/docs/testing/phpunit.md
index c68eeef7..6c435584 100644
--- a/docs/testing/phpunit.md
+++ b/docs/testing/phpunit.md
@@ -52,18 +52,7 @@ $ env CIVICRM_UF=UnitTests phpunit4 ./tests/phpunit/api/v3/CaseTest.php --filter
You can also specify tests in an environment variable `PHPUNIT_TESTS` (eg. `env PHPUNIT_TESTS="MyFirstTest::testFoo MySecondTest" phpunit EnvTests`
Then run `phpunit4 ./tests/phpunit/EnvTests.php`.
-You can also optionally run a full standard CiviCRM Test suite by running `civi-test-run` as per example below
-
-```bash
-$ civi-test-run "<buildName>" "<civicrm version>" "<junit dir>" "<test-type>"
-```
-The test type is one of:
-
-- All: Run all standard CiviCRM Test Suites
-- phpunit-e2e - Run the E2E test suite
-- phpunit-civi - Run the Civi/ Test Suite
-- phpunit-api - Run the `api_v3` Test Suite
-- phpunit-crm - Run the `CRM` Test Suite
+You can also optionally use [civi-test-run](/tools/civi-test-run.md) to run a full standard CiviCRM Test suite.
## Writing Tests
diff --git a/docs/testing/upgrades.md b/docs/testing/upgrades.md
index d3d8408b..95420007 100644
--- a/docs/testing/upgrades.md
+++ b/docs/testing/upgrades.md
@@ -8,10 +8,4 @@ CMS-integration.
Upgrade tests are run daily on the Jenkins [continuous integration](/testing/continuous-integration.md) server.
-## Local Upgrade Testing
-
-Locally you can run the same upgrade tests as Jenkins would using `civi-test-run` as per the following example
-
-```bash
-$ civi-test-run "<civibuildname>" "<civiversion>" "<junitdir>" "upgrade"
-```
+Locally you can use [civi-test-run](/tools/civi-test-run.md) to run the same upgrade tests as Jenkins would.
--
GitLab