| Message ID | 20210601184215.3829249-1-blp@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] tests: Fix PKIDIR checks in AT_SKIP. | expand |
On Tue, Jun 1, 2021 at 11:42 AM Ben Pfaff <blp@ovn.org> wrote: > > In Autotest, [xyz] just expands to xyz. To get [xyz] in output, we > need [[xyz]] in input. > > I spotted this based on "expr" reporting an error in testsuite output. > > Signed-off-by: Ben Pfaff <blp@ovn.org> > --- > tests/ovsdb-server.at | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at > index 926abce3a359..0badafa3291d 100644 > --- a/tests/ovsdb-server.at > +++ b/tests/ovsdb-server.at > @@ -548,8 +548,8 @@ AT_SKIP_IF([test "$HAVE_OPENSSL" = no]) > # msys on Windows does not convert the path style automatically. > # So, do that forcefully with a 'pwd -W' (called through pwd() function). > PKIDIR="$(cd $abs_top_builddir/tests && pwd)" > -AT_SKIP_IF([expr "$PKIDIR" : ".*[ '\" > -\\]"]) > +AT_SKIP_IF([expr "$PKIDIR" : ".*[[ '\" > +\\]]"]) > AT_DATA([schema], > [[{"name": "mydb", > "tables": { > -- > 2.31.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev LGTM for both patches with the same commit message (are they made the same intentionally?) Acked-by: Han Zhou <hzhou@ovn.org>
On Tue, Jun 01, 2021 at 11:32:59PM -0700, Han Zhou wrote: > On Tue, Jun 1, 2021 at 11:42 AM Ben Pfaff <blp@ovn.org> wrote: > > > > In Autotest, [xyz] just expands to xyz. To get [xyz] in output, we > > need [[xyz]] in input. > > > > I spotted this based on "expr" reporting an error in testsuite output. > > > > Signed-off-by: Ben Pfaff <blp@ovn.org> > > --- > > tests/ovsdb-server.at | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at > > index 926abce3a359..0badafa3291d 100644 > > --- a/tests/ovsdb-server.at > > +++ b/tests/ovsdb-server.at > > @@ -548,8 +548,8 @@ AT_SKIP_IF([test "$HAVE_OPENSSL" = no]) > > # msys on Windows does not convert the path style automatically. > > # So, do that forcefully with a 'pwd -W' (called through pwd() function). > > PKIDIR="$(cd $abs_top_builddir/tests && pwd)" > > -AT_SKIP_IF([expr "$PKIDIR" : ".*[ '\" > > -\\]"]) > > +AT_SKIP_IF([expr "$PKIDIR" : ".*[[ '\" > > +\\]]"]) > > AT_DATA([schema], > > [[{"name": "mydb", > > "tables": { > > -- > > 2.31.1 > > > > _______________________________________________ > > dev mailing list > > dev@openvswitch.org > > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > > LGTM for both patches with the same commit message (are they made the same > intentionally?) Thanks. I gave them the same commit message because they fixed the same problem in the same way. > Acked-by: Han Zhou <hzhou@ovn.org>
diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index 926abce3a359..0badafa3291d 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -548,8 +548,8 @@ AT_SKIP_IF([test "$HAVE_OPENSSL" = no]) # msys on Windows does not convert the path style automatically. # So, do that forcefully with a 'pwd -W' (called through pwd() function). PKIDIR="$(cd $abs_top_builddir/tests && pwd)" -AT_SKIP_IF([expr "$PKIDIR" : ".*[ '\" -\\]"]) +AT_SKIP_IF([expr "$PKIDIR" : ".*[[ '\" +\\]]"]) AT_DATA([schema], [[{"name": "mydb", "tables": {
In Autotest, [xyz] just expands to xyz. To get [xyz] in output, we need [[xyz]] in input. I spotted this based on "expr" reporting an error in testsuite output. Signed-off-by: Ben Pfaff <blp@ovn.org> --- tests/ovsdb-server.at | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)