Test: Remove legacy test runner

Automattic · Apr 7, 2016 · 8e2115d · 8e2115d
1 parent a6c4602
commit 8e2115d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 107 deletions.
diff --git a/Makefile b/Makefile
@@ -93,12 +93,10 @@ node_modules: package.json | node-version
 	@$(NPM) install
 	@touch node_modules
 
-# run `make test` in all discovered Makefiles
 test: build
 	@npm run test-client
 	@npm run test-server
 	@npm run test-tests
-	@$(BIN)/run-all-tests
 
 lint: node_modules/eslint node_modules/eslint-plugin-react node_modules/babel-eslint mixedindentlint
 	@$(NPM) run lint

diff --git a/bin/run-all-tests b/bin/run-all-tests
diff --git a/bin/run-tests b/bin/run-tests
diff --git a/circle.yml b/circle.yml
@@ -10,11 +10,8 @@ test:
           - client/**/*.jsx
           - server/**/*.js
           - server/**/*.jsx
-    - NODE_ENV=test make client/config/index.js && NODE_ENV=test ./bin/run-tests:
-        parallel: true
-        files:
-          - client/**/Makefile
-          - server/**/Makefile
+          - test/**/*.js
+          - test/**/*.jsx
     - NODE_ENV=test make client/config/index.js && MOCHA_FILE=./test-results-client.xml npm run test-client -- --reporter=mocha-junit-reporter -w:
         parallel: true
         files: