|
34 | 34 | test_description='git cvsimport handling of vendor branches'
|
35 | 35 | . ./lib-cvs.sh
|
36 | 36 |
|
37 |
| -CVSROOT="$TEST_DIRECTORY"/t9601/cvsroot |
38 |
| -export CVSROOT |
| 37 | +test_expect_success PERL 'setup CVSROOT' ' |
| 38 | + CVSROOT="$TEST_DIRECTORY"/t9601/cvsroot && |
| 39 | + export CVSROOT |
| 40 | +' |
39 | 41 |
|
40 |
| -test_expect_success 'import a module with a vendor branch' ' |
| 42 | +test_expect_success PERL 'import a module with a vendor branch' ' |
41 | 43 |
|
42 | 44 | git cvsimport -C module-git module
|
43 | 45 |
|
44 | 46 | '
|
45 | 47 |
|
46 |
| -test_expect_success 'check HEAD out of cvs repository' 'test_cvs_co master' |
| 48 | +test_expect_success PERL 'check HEAD out of cvs repository' 'test_cvs_co master' |
47 | 49 |
|
48 |
| -test_expect_success 'check master out of git repository' 'test_git_co master' |
| 50 | +test_expect_success PERL 'check master out of git repository' 'test_git_co master' |
49 | 51 |
|
50 |
| -test_expect_success 'check a file that was imported once' ' |
| 52 | +test_expect_success PERL 'check a file that was imported once' ' |
51 | 53 |
|
52 | 54 | test_cmp_branch_file master imported-once.txt
|
53 | 55 |
|
54 | 56 | '
|
55 | 57 |
|
56 |
| -test_expect_failure 'check a file that was imported twice' ' |
| 58 | +test_expect_failure PERL 'check a file that was imported twice' ' |
57 | 59 |
|
58 | 60 | test_cmp_branch_file master imported-twice.txt
|
59 | 61 |
|
60 | 62 | '
|
61 | 63 |
|
62 |
| -test_expect_success 'check a file that was imported then modified on HEAD' ' |
| 64 | +test_expect_success PERL 'check a file that was imported then modified on HEAD' ' |
63 | 65 |
|
64 | 66 | test_cmp_branch_file master imported-modified.txt
|
65 | 67 |
|
66 | 68 | '
|
67 | 69 |
|
68 |
| -test_expect_success 'check a file that was imported, modified, then imported again' ' |
| 70 | +test_expect_success PERL 'check a file that was imported, modified, then imported again' ' |
69 | 71 |
|
70 | 72 | test_cmp_branch_file master imported-modified-imported.txt
|
71 | 73 |
|
72 | 74 | '
|
73 | 75 |
|
74 |
| -test_expect_success 'check a file that was added to HEAD then imported' ' |
| 76 | +test_expect_success PERL 'check a file that was added to HEAD then imported' ' |
75 | 77 |
|
76 | 78 | test_cmp_branch_file master added-imported.txt
|
77 | 79 |
|
78 | 80 | '
|
79 | 81 |
|
80 |
| -test_expect_success 'a vendor branch whose tag has been removed' ' |
| 82 | +test_expect_success PERL 'a vendor branch whose tag has been removed' ' |
81 | 83 |
|
82 | 84 | test_cmp_branch_file master imported-anonymously.txt
|
83 | 85 |
|
|
0 commit comments