Skip to content

Commit

Permalink
Move tests/run-test-suite to branch run-test-suite
Browse files Browse the repository at this point in the history
with the intent that `make test-suite` will use it as a branch.

This commit makes the libyaml and yaml-test-suite repos completely
independent. The only thing in master is a Makefile rule for
`make run-test-suite`.

The run-test-suite branch takes care of everything else.

This will keep the master branch history clean from any yaml-test-suite
activity, while keeping everything up to date.

Pinning will just work for whatever commit of master you run the tests
from. The pinning work will all be done in the `run-test-suite` branch.
  • Loading branch information
ingydotnet committed Dec 30, 2017
1 parent 6a9e942 commit e4aee06
Show file tree
Hide file tree
Showing 15 changed files with 13 additions and 647 deletions.
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,7 @@ Makefile.in
/tests/run-parser
/tests/run-parser-test-suite
/tests/run-scanner
/tests/run-test-suite/data
tests/run-test-suite/src/libyaml/
tests/run-test-suite/src/libyaml-emitter
tests/run-test-suite/src/libyaml-parser
/tests/run-test-suite/
/tests/test-reader
/tests/test-reader.log
/tests/test-reader.trs
Expand Down
3 changes: 2 additions & 1 deletion .makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,6 @@ indent:
$(INDENT) $(SOURCE_FILES)

distclean purge:
rm -fr tests/run-test-suite/data
git clean -dxf -e GNUmakefile
rm -fr tests/run-test-suite
git worktree prune
11 changes: 8 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ maintainer-clean-local:
-find ${builddir} -name Makefile.in -exec rm -f '{}' ';'

distclean-local:
-make -C tests/run-test-suite clean
-rm -fr tests/run-test-suite
-git worktree prune

.PHONY: bootstrap
bootstrap: maintainer-clean
Expand All @@ -24,7 +25,11 @@ bootstrap: maintainer-clean
test: all
make -C tests check-TESTS

test-suite:
make -C tests/run-test-suite test
test-suite: tests/run-test-suite
make -C $< test

test-all: test test-suite

tests/run-test-suite:
git fetch origin run-test-suite:run-test-suite
git worktree add $@ run-test-suite
20 changes: 0 additions & 20 deletions tests/run-test-suite/Makefile

This file was deleted.

35 changes: 0 additions & 35 deletions tests/run-test-suite/ReadMe.md

This file was deleted.

59 changes: 0 additions & 59 deletions tests/run-test-suite/src/test/example-2.27-invoice.events

This file was deleted.

26 changes: 0 additions & 26 deletions tests/run-test-suite/src/test/example-2.27-invoice.out

This file was deleted.

29 changes: 0 additions & 29 deletions tests/run-test-suite/src/test/example-2.27-invoice.yaml

This file was deleted.

26 changes: 0 additions & 26 deletions tests/run-test-suite/src/test/libyaml-emitter.t

This file was deleted.

26 changes: 0 additions & 26 deletions tests/run-test-suite/src/test/libyaml-parser.t

This file was deleted.

Loading

0 comments on commit e4aee06

Please sign in to comment.