Fossil SCM
More test fixes in the 'th1' test file.
Commit
5d49329fc24d9a6084519d8e1474945160911eee
Parent
7b9b5807f48f9e5…
1 file changed
+24
-8
+24
-8
| --- test/th1.test | ||
| +++ test/th1.test | ||
| @@ -554,16 +554,22 @@ | ||
| 554 | 554 | fossil test-th-eval "lindex list -0x" |
| 555 | 555 | test th1-expr-49 {$RESULT eq {TH_ERROR: expected integer, got: "-0x"}} |
| 556 | 556 | |
| 557 | 557 | ############################################################################### |
| 558 | 558 | |
| 559 | -fossil test-th-eval "checkout 1"; # NOTE: Assumes running "in tree". | |
| 559 | +run_in_checkout { | |
| 560 | + fossil test-th-eval "checkout 1" | |
| 561 | +} | |
| 562 | + | |
| 560 | 563 | test th1-checkout-1 {[string length $RESULT] > 0} |
| 561 | 564 | |
| 562 | 565 | ############################################################################### |
| 563 | 566 | |
| 564 | -fossil test-th-eval "checkout"; # NOTE: Assumes running "in tree". | |
| 567 | +run_in_checkout { | |
| 568 | + fossil test-th-eval "checkout" | |
| 569 | +} | |
| 570 | + | |
| 565 | 571 | test th1-checkout-2 {[string length $RESULT] > 0} |
| 566 | 572 | |
| 567 | 573 | ############################################################################### |
| 568 | 574 | |
| 569 | 575 | set savedPwd [pwd]; cd / |
| @@ -766,17 +772,22 @@ | ||
| 766 | 772 | fossil test-th-eval --open-config "artifact 0000000000 test/th1.test" |
| 767 | 773 | test th1-artifact-9 {$RESULT eq {TH_ERROR: manifest not found}} |
| 768 | 774 | |
| 769 | 775 | ############################################################################### |
| 770 | 776 | |
| 771 | -fossil test-th-eval "globalState checkout" | |
| 777 | +run_in_checkout { | |
| 778 | + fossil test-th-eval "globalState checkout" | |
| 779 | +} | |
| 780 | + | |
| 772 | 781 | test th1-globalState-1 {[string length $RESULT] > 0} |
| 773 | 782 | |
| 774 | 783 | ############################################################################### |
| 775 | 784 | |
| 776 | -fossil test-th-eval "globalState checkout" | |
| 777 | -test th1-globalState-2 {$RESULT eq [fossil test-th-eval checkout]} | |
| 785 | +run_in_checkout { | |
| 786 | + fossil test-th-eval "globalState checkout" | |
| 787 | + test th1-globalState-2 {$RESULT eq [fossil test-th-eval checkout]} | |
| 788 | +} | |
| 778 | 789 | |
| 779 | 790 | ############################################################################### |
| 780 | 791 | |
| 781 | 792 | fossil test-th-eval "globalState configuration" |
| 782 | 793 | test th1-globalState-3 {[string length $RESULT] == 0} |
| @@ -801,17 +812,22 @@ | ||
| 801 | 812 | fossil test-th-eval --errorlog foserrors.log "globalState log" |
| 802 | 813 | test th1-globalState-7 {$RESULT eq "foserrors.log"} |
| 803 | 814 | |
| 804 | 815 | ############################################################################### |
| 805 | 816 | |
| 806 | -fossil test-th-eval "globalState repository" | |
| 817 | +run_in_checkout { | |
| 818 | + fossil test-th-eval "globalState repository" | |
| 819 | +} | |
| 820 | + | |
| 807 | 821 | test th1-globalState-8 {[string length $RESULT] > 0} |
| 808 | 822 | |
| 809 | 823 | ############################################################################### |
| 810 | 824 | |
| 811 | -fossil test-th-eval "globalState repository" | |
| 812 | -test th1-globalState-9 {$RESULT eq [fossil test-th-eval repository]} | |
| 825 | +run_in_checkout { | |
| 826 | + fossil test-th-eval "globalState repository" | |
| 827 | + test th1-globalState-9 {$RESULT eq [fossil test-th-eval repository]} | |
| 828 | +} | |
| 813 | 829 | |
| 814 | 830 | ############################################################################### |
| 815 | 831 | |
| 816 | 832 | fossil test-th-eval "globalState top" |
| 817 | 833 | test th1-globalState-10 {[string length $RESULT] == 0} |
| 818 | 834 |
| --- test/th1.test | |
| +++ test/th1.test | |
| @@ -554,16 +554,22 @@ | |
| 554 | fossil test-th-eval "lindex list -0x" |
| 555 | test th1-expr-49 {$RESULT eq {TH_ERROR: expected integer, got: "-0x"}} |
| 556 | |
| 557 | ############################################################################### |
| 558 | |
| 559 | fossil test-th-eval "checkout 1"; # NOTE: Assumes running "in tree". |
| 560 | test th1-checkout-1 {[string length $RESULT] > 0} |
| 561 | |
| 562 | ############################################################################### |
| 563 | |
| 564 | fossil test-th-eval "checkout"; # NOTE: Assumes running "in tree". |
| 565 | test th1-checkout-2 {[string length $RESULT] > 0} |
| 566 | |
| 567 | ############################################################################### |
| 568 | |
| 569 | set savedPwd [pwd]; cd / |
| @@ -766,17 +772,22 @@ | |
| 766 | fossil test-th-eval --open-config "artifact 0000000000 test/th1.test" |
| 767 | test th1-artifact-9 {$RESULT eq {TH_ERROR: manifest not found}} |
| 768 | |
| 769 | ############################################################################### |
| 770 | |
| 771 | fossil test-th-eval "globalState checkout" |
| 772 | test th1-globalState-1 {[string length $RESULT] > 0} |
| 773 | |
| 774 | ############################################################################### |
| 775 | |
| 776 | fossil test-th-eval "globalState checkout" |
| 777 | test th1-globalState-2 {$RESULT eq [fossil test-th-eval checkout]} |
| 778 | |
| 779 | ############################################################################### |
| 780 | |
| 781 | fossil test-th-eval "globalState configuration" |
| 782 | test th1-globalState-3 {[string length $RESULT] == 0} |
| @@ -801,17 +812,22 @@ | |
| 801 | fossil test-th-eval --errorlog foserrors.log "globalState log" |
| 802 | test th1-globalState-7 {$RESULT eq "foserrors.log"} |
| 803 | |
| 804 | ############################################################################### |
| 805 | |
| 806 | fossil test-th-eval "globalState repository" |
| 807 | test th1-globalState-8 {[string length $RESULT] > 0} |
| 808 | |
| 809 | ############################################################################### |
| 810 | |
| 811 | fossil test-th-eval "globalState repository" |
| 812 | test th1-globalState-9 {$RESULT eq [fossil test-th-eval repository]} |
| 813 | |
| 814 | ############################################################################### |
| 815 | |
| 816 | fossil test-th-eval "globalState top" |
| 817 | test th1-globalState-10 {[string length $RESULT] == 0} |
| 818 |
| --- test/th1.test | |
| +++ test/th1.test | |
| @@ -554,16 +554,22 @@ | |
| 554 | fossil test-th-eval "lindex list -0x" |
| 555 | test th1-expr-49 {$RESULT eq {TH_ERROR: expected integer, got: "-0x"}} |
| 556 | |
| 557 | ############################################################################### |
| 558 | |
| 559 | run_in_checkout { |
| 560 | fossil test-th-eval "checkout 1" |
| 561 | } |
| 562 | |
| 563 | test th1-checkout-1 {[string length $RESULT] > 0} |
| 564 | |
| 565 | ############################################################################### |
| 566 | |
| 567 | run_in_checkout { |
| 568 | fossil test-th-eval "checkout" |
| 569 | } |
| 570 | |
| 571 | test th1-checkout-2 {[string length $RESULT] > 0} |
| 572 | |
| 573 | ############################################################################### |
| 574 | |
| 575 | set savedPwd [pwd]; cd / |
| @@ -766,17 +772,22 @@ | |
| 772 | fossil test-th-eval --open-config "artifact 0000000000 test/th1.test" |
| 773 | test th1-artifact-9 {$RESULT eq {TH_ERROR: manifest not found}} |
| 774 | |
| 775 | ############################################################################### |
| 776 | |
| 777 | run_in_checkout { |
| 778 | fossil test-th-eval "globalState checkout" |
| 779 | } |
| 780 | |
| 781 | test th1-globalState-1 {[string length $RESULT] > 0} |
| 782 | |
| 783 | ############################################################################### |
| 784 | |
| 785 | run_in_checkout { |
| 786 | fossil test-th-eval "globalState checkout" |
| 787 | test th1-globalState-2 {$RESULT eq [fossil test-th-eval checkout]} |
| 788 | } |
| 789 | |
| 790 | ############################################################################### |
| 791 | |
| 792 | fossil test-th-eval "globalState configuration" |
| 793 | test th1-globalState-3 {[string length $RESULT] == 0} |
| @@ -801,17 +812,22 @@ | |
| 812 | fossil test-th-eval --errorlog foserrors.log "globalState log" |
| 813 | test th1-globalState-7 {$RESULT eq "foserrors.log"} |
| 814 | |
| 815 | ############################################################################### |
| 816 | |
| 817 | run_in_checkout { |
| 818 | fossil test-th-eval "globalState repository" |
| 819 | } |
| 820 | |
| 821 | test th1-globalState-8 {[string length $RESULT] > 0} |
| 822 | |
| 823 | ############################################################################### |
| 824 | |
| 825 | run_in_checkout { |
| 826 | fossil test-th-eval "globalState repository" |
| 827 | test th1-globalState-9 {$RESULT eq [fossil test-th-eval repository]} |
| 828 | } |
| 829 | |
| 830 | ############################################################################### |
| 831 | |
| 832 | fossil test-th-eval "globalState top" |
| 833 | test th1-globalState-10 {[string length $RESULT] == 0} |
| 834 |