xref: /freebsd/contrib/netbsd-tests/FREEBSD-upgrade (revision 57718be8fa0bd5edc11ab9a72e68cc71982939a6)
1*57718be8SEnji Cooper$FreeBSD$
2*57718be8SEnji Cooper
3*57718be8SEnji CooperThis document contains a collection of notes specific to the import
4*57718be8SEnji Cooperof the NetBSD test suite into head.  These notes are built on the instructions
5*57718be8SEnji Cooperin the FreeBSD Subversion Primer that detail how to deal with vendor
6*57718be8SEnji Cooperbranches and you are supposed to follow those:
7*57718be8SEnji Cooper
8*57718be8SEnji Cooper	http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html
9*57718be8SEnji Cooper
10*57718be8SEnji CooperThe NetBSD test source code was originally obtained via NetBSD anoncvs as
11*57718be8SEnji Cooperdescribed in the NetBSD handbook:
12*57718be8SEnji Cooper
13*57718be8SEnji Cooper	http://www.netbsd.org/docs/guide/en/chap-fetch.html#chap-fetch-cvs
14*57718be8SEnji Cooper
15*57718be8SEnji Cooperand is imported into the NetBSD/tests vendor branch (see
16*57718be8SEnji Cooperbase/vendor/NetBSD/tests/).
17*57718be8SEnji Cooper
18*57718be8SEnji CooperThe process used to bootstrap the vendor tree was similar to the following:
19*57718be8SEnji Cooper
20*57718be8SEnji Cooper	/bin/sh
21*57718be8SEnji Cooper	export CVSROOT="anoncvs@anoncvs.NetBSD.org:/cvsroot"
22*57718be8SEnji Cooper	cvs -z9 co -D "09/30/2014 20:45" -P src/tests
23*57718be8SEnji Cooper	mv src/tests/* tests/dist/.
24*57718be8SEnji Cooper
25*57718be8SEnji CooperPlease adjust the checkout date spec (the argument passed via -D) to match
26*57718be8SEnji Cooperthe desired checkout time.
27*57718be8SEnji Cooper
28*57718be8SEnji CooperTo merge the vendor branch into head do something like this:
29*57718be8SEnji Cooper
30*57718be8SEnji Cooper	cd .../base/head/contrib/netbsd-tests
31*57718be8SEnji Cooper	svn merge --accept=postpone \
32*57718be8SEnji Cooper	    svn+ssh://svn.freebsd.org/base/vendor/NetBSD/tests/dist .
33*57718be8SEnji Cooper	find . -name Makefile\* | xargs svn rm --force
34*57718be8SEnji Cooper
35*57718be8SEnji Cooperand resolve any conflicts that may arise at this point.
36*57718be8SEnji Cooper
37*57718be8SEnji CooperLastly, with the list of old and new files in this import, make sure
38*57718be8SEnji Cooperto update the reachover Makefiles accordingly.
39