Changeset 84038c8


Ignore:
Timestamp:
Jul 16, 2013 11:04:41 AM (6 years ago)
Author:
Mei <mei@…>
Branches:
abac0-leak, abac0-mei, master
Children:
2e87ebb, 94dadbd
Parents:
a1a9a47
Message:

1) tweak Makefile for wiki test examples so it will run correctly

for bsd

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • doc/ChangeLog

    r3c30b59 r84038c8  
    11= 0.1.5 =
    22
    3     2013-07-YY
     3    2013-07-17
    44        * Support for human readable strings in credential printing.
    55          User can associate nicknames with principals and selectively
  • tests/example_scripts/wiki/Makefile.am

    r1afd681 r84038c8  
    104104          r1=`grep "&lt;-" V1_attr.xml |wc -l` ; \
    105105          r2=`grep "<ABACprincipal><keyid>" V1_1_attr.xml V1_1b_attr.xml |wc -l` ; \
    106           rc="$$r1"+"$$r2"; \
    107         if [ "$$list" != "GENIv1.0GENIv1.1GENIv1.1" -o "$$rc" != "1+4" ]; then \
     106        if [ "$$list" != "GENIv1.0GENIv1.1GENIv1.1" -o $$r1 -ne 1 -o $$r2 -ne 4 ]; then \
    108107          echo "BAD:example_scripts/wiki/attr3.py:different attr rt0 xml format"; \
    109108        else \
     
    116115        @(rs=`$(MY_ENV) ./attr4_setup.py`; \
    117116          rc=`$(MY_ENV) ./attr4.py | grep mnemonic |wc -l`; \
    118         if [ "$$rc" != "6" ]; then \
     117        if [ $$rc -ne 6 ]; then \
    119118          echo "BAD:example_scripts/wiki/attr4.py:setting nickname in attr"; \
    120119        else \
     
    158157        @$(MY_ENV) ./ctxtQuery4_setup.py 1>/dev/null 2>&1;
    159158        @(rc=`$(MY_ENV) ./ctxtQuery4.py | grep identity1 |wc -l` ; \
    160         if [ "$$rc" = "1" ]; then \
     159        if [ $$rc -eq 1 ]; then \
    161160          echo "GOOD:example_scripts/wiki/ctxtQuery4.py:trying mnemonic modification names"; \
    162161        else \
Note: See TracChangeset for help on using the changeset viewer.