Changeset 141417 for trunk/base


Ignore:
Timestamp:
Oct 18, 2015, 12:37:12 AM (4 years ago)
Author:
cal@…
Message:

base: test/trace: Adapt to new output format

Trace mode no longer prints a message for each trace violation; Adjust the
expected output accordingly.

Location:
trunk/base/tests/test/trace
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/tests/test/trace/Makefile

    r107524 r141417  
    1919        @ln -sf /usr/include/unistd.h /tmp/link-trace2
    2020        @-[ "`id -u`" == "0" ] && chown -h $(RUNUSR) /tmp/link-trace2
    21         @PORTSRC=$(PORTSRC) $(bindir)/port -t test > output 2>&1 || (cat output; exit 1)
     21        @PORTSRC=$(PORTSRC) $(bindir)/port -vt test > output 2>&1 || (cat output; exit 1)
    2222        @rm -f /tmp/link-trace2
    2323        @rm -f /tmp/hello-trace
    2424        @rm -rf ../tracetesttmp
    25         @sed -e "s|$(PWD)|PWD|g" < output > output.sed
    26         @diff -u master output.sed 2>&1 | tee difference
     25        @diff -u master output 2>&1 | tee difference
    2726        @if [ -s difference ]; then \
    2827                exit 1; \
    2928        else \
    30                 rm -f difference output.sed; \
     29                rm -f difference output; \
    3130        fi
    3231
  • trunk/base/tests/test/trace/Portfile

    r107515 r141417  
    2525            ui_error "Operation ${operation} succeeded although it should have failed!"
    2626            error "test failure"
     27        } else {
     28            ui_info "${operation} failed as expected"
    2729        }
    2830    }
  • trunk/base/tests/test/trace/master

    r107516 r141417  
    55--->  Building trace
    66--->  Testing trace
    7 Warning: An activity was attempted outside sandbox: PWD/tracetesttmp/create-trace
    8 Warning: An activity was attempted outside sandbox: PWD/tracetesttmp/create-trace-modenv
    9 Warning: An activity was attempted outside sandbox: PWD/tracetesttmp/delete-trace
    10 Warning: An activity was attempted outside sandbox: PWD/tracetesttmp/mkdir-trace
    11 Warning: An activity was attempted outside sandbox: PWD/tracetesttmp/rename-trace
    12 Warning: An activity was attempted outside sandbox: PWD/tracetesttmp/rmdir-trace
     7touch: ../tracetesttmp/create-trace: No such file or directory
     8Command failed: touch ../tracetesttmp/create-trace
     9Exit code: 1
     10system "touch ../tracetesttmp/create-trace" failed as expected
     11rm: ../tracetesttmp/delete-trace: No such file or directory
     12Command failed: rm ../tracetesttmp/delete-trace
     13Exit code: 1
     14system "rm ../tracetesttmp/delete-trace" failed as expected
     15ln: ../tracetesttmp/link-trace: No such file or directory
     16Command failed: ln -s /usr/include/ ../tracetesttmp/link-trace
     17Exit code: 1
     18system "ln -s /usr/include/ ../tracetesttmp/link-trace" failed as expected
     19mkdir: ../tracetesttmp: No such file or directory
     20Command failed: mkdir ../tracetesttmp/mkdir-trace
     21Exit code: 1
     22system "mkdir ../tracetesttmp/mkdir-trace" failed as expected
     23rmdir: ../tracetesttmp/rmdir-trace: No such file or directory
     24Command failed: rmdir ../tracetesttmp/rmdir-trace
     25Exit code: 1
     26system "rmdir ../tracetesttmp/rmdir-trace" failed as expected
     27mv: rename ../tracetesttmp/rename-trace to ../tracetesttmp/rename-new-trace: No such file or directory
     28Command failed: mv ../tracetesttmp/rename-trace ../tracetesttmp/rename-new-trace
     29Exit code: 1
     30system "mv ../tracetesttmp/rename-trace ../tracetesttmp/rename-new-trace" failed as expected
     31touch: ../tracetesttmp/create-trace-modenv: No such file or directory
     32Command failed: DYLD_INSERT_LIBRARIES= touch ../tracetesttmp/create-trace-modenv
     33Exit code: 1
     34system "DYLD_INSERT_LIBRARIES= touch ../tracetesttmp/create-trace-modenv" failed as expected
Note: See TracChangeset for help on using the changeset viewer.