Changeset 59679


Ignore:
Timestamp:
Oct 19, 2009, 6:31:18 PM (11 years ago)
Author:
jmr@…
Message:

get most of the tests working again

Location:
trunk/base
Files:
1 added
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/macports1.0/macports.tcl

    r59582 r59679  
    21042104            array set portinfo [lindex $res 1]
    21052105            if {![info exists portinfo(porturl)]} {
     2106                if {![macports::ui_isset ports_debug]} {
     2107                    ui_msg ""
     2108                }
    21062109                ui_error "Dependency '$dep_portname' not found."
    21072110                return 1
  • trunk/base/tests/Makefile

    r59676 r59679  
    5252                                PORTSRC=$(PWD)/test-macports.conf $(bindir)/port clean > /dev/null && \
    5353                                PORTSRC=$(PWD)/test-macports.conf $(bindir)/port test > output 2>&1 \
    54                                         || (cat output; exit 1) && \
     54                                        || ([ -e error_expected ] || (cat output; exit 1)) && \
    5555                        sed -e "s|${PWD}|PWD|g" < output > output.sed && \
    5656                        diff output.sed master 2>&1 | tee difference && \
  • trunk/base/tests/test/case-insensitive-deactivate/Makefile

    r37267 r59679  
    1515        @echo port install $(TESTPORT1)
    1616        @sed 's/@name@/$(TESTPORT1)/' Portfile.in > Portfile
    17         @PORTSRC=$(PORTSRC) $(bindir)/port -x install > output 2>&1 || (cat output; exit 1)
     17        @PORTSRC=$(PORTSRC) $(bindir)/port install > output 2>&1 || (cat output; exit 1)
    1818        @if [ ! -f $(TESTFILE) ]; then \
    1919                echo "FAILED: File should exist after install: $(TESTFILE)" && exit 1; \
     
    2121        @echo port uninstall $(TESTPORT2)
    2222        @sed 's/@name@/$(TESTPORT2)/' Portfile.in > Portfile
    23         @PORTSRC=$(PORTSRC) $(bindir)/port -x uninstall > output 2>&1 || (cat output; exit 1)
     23        @PORTSRC=$(PORTSRC) $(bindir)/port uninstall > output 2>&1 || (cat output; exit 1)
    2424        @if [ -f $(TESTFILE) ]; then \
    2525                rm $(TESTFILE); \
  • trunk/base/tests/test/checksums-1/master

    r41522 r59679  
     1--->  Computing dependencies for checksum
    12--->  Fetching checksum
    23--->  Verifying checksum(s) for checksum
  • trunk/base/tests/test/cvs-and-patchsites/master

    r41522 r59679  
     1--->  Computing dependencies for cvs-and-patchsites
    12--->  Fetching cvs-and-patchsites
    23--->  Attempting to fetch patch-1.5.14.dgc.xlabel_ext.9 from http://home.uchicago.edu/~dgc/sw/mutt/
  • trunk/base/tests/test/dependencies-c/master

    r41522 r59679  
     1--->  Computing dependencies for dependencies-c
    12--->  Fetching dependencies-b
    23--->  Verifying checksum(s) for dependencies-b
  • trunk/base/tests/test/dependencies-d/master

    r41526 r59679  
    11Warning: depends option is not handled yet
    22Warning: depends option is not handled yet
     3--->  Computing dependencies for dependencies-d
    34--->  Fetching dependencies-b
    45--->  Verifying checksum(s) for dependencies-b
  • trunk/base/tests/test/dependencies-e/master

    r41527 r59679  
     1--->  Computing dependencies for dependencies-e
    12Error: Dependency 'docbook-xml-4.1.2' not found.
    23Error: Status 1 encountered during processing.
  • trunk/base/tests/test/envvariables/master

    r41522 r59679  
     1--->  Computing dependencies for envvariables
    12--->  Fetching envvariables
    23--->  Verifying checksum(s) for envvariables
  • trunk/base/tests/test/site-tags/master

    r47331 r59679  
     1--->  Computing dependencies for site-tags
    12--->  Fetching site-tags
    23--->  Attempting to fetch app-bm.tar.gz from http://www.douglas.stebila.ca/code/vim/app/
  • trunk/base/tests/test/trace/master

    r41525 r59679  
     1--->  Computing dependencies for trace
    12--->  Fetching trace
    23--->  Verifying checksum(s) for trace
  • trunk/base/tests/test/universal-2/master

    r37271 r59679  
    1 no info for 'variants'
    21variants:
  • trunk/base/tests/test/variants/master

    r41523 r59679  
    11Utopia platform -- 1
    2 Utopia platform -- 2
     2Utopia platform -- 1
     3--->  Computing dependencies for variants
    34--->  Fetching variants
    45--->  Verifying checksum(s) for variants
  • trunk/base/tests/test/xcodeversion/master

    r41522 r59679  
     1--->  Computing dependencies for xcodeversion
    12--->  Fetching xcodeversion
    23--->  Verifying checksum(s) for xcodeversion
Note: See TracChangeset for help on using the changeset viewer.