On Friday, 2017-11-24 10:08:55 +0000, Eric Engestrom wrote:
> On Thursday, 2017-11-23 11:08:05 -0800, Matt Turner wrote:
> > ---
> > src/util/Makefile.am | 3 ++-
> > src/util/mesa-sha1_test.c | 65
> > +++++++++++++++++++++++++++++++++++++++++++++++
> > 2 files changed, 67 insertions(+), 1 deletion(-)
> > create mode 100644 src/util/mesa-sha1_test.c
> >
> > diff --git a/src/util/Makefile.am b/src/util/Makefile.am
> > index b57da3cd94..a5241ad27b 100644
> > --- a/src/util/Makefile.am
> > +++ b/src/util/Makefile.am
> > @@ -68,8 +68,9 @@ sysconf_DATA = drirc
> >
> > u_atomic_test_LDADD = libmesautil.la
> > roundeven_test_LDADD = -lm
> > +mesa_sha1_test_LDADD = libmesautil.la
> >
> > -check_PROGRAMS = u_atomic_test roundeven_test
> > +check_PROGRAMS = u_atomic_test roundeven_test mesa-sha1_test
> > TESTS = $(check_PROGRAMS)
> >
> > BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES)
>
> You can add:
>
> ----8<----
> diff --git a/src/util/meson.build b/src/util/meson.build
> index ac86c9e111eeb89a0249..23d7f51ecb4f7b060369 100644
> --- a/src/util/meson.build
> +++ b/src/util/meson.build
> @@ -134,8 +134,17 @@ if with_tests
> dependencies : [dep_m],
> )
>
> + mesa-sha1_test = executable(
> + 'mesa-sha1_test',
> + files('mesa-sha1_test.c'),
> + include_directories : inc_common,
> + link_with : libmesa_util,
> + c_args : [c_msvc_compat_args],
> + )
> +
> test('u_atomic', u_atomic_test)
> test('roundeven', roundeven_test)
> + test('mesa-sha1', mesa-sha1_test)
Oops, didn't test it; `-` are not allowed in vars, please replace
`s/mesa-sha1_test/mesa_sha1_test/` on this line and the `executable(`
line :)
>
> subdir('tests/hash_table')
> subdir('tests/string_buffer')
> ---->8----
>
> > diff --git a/src/util/mesa-sha1_test.c b/src/util/mesa-sha1_test.c
> > new file mode 100644
> > index 0000000000..9b3b477c7f
> > --- /dev/null
> > +++ b/src/util/mesa-sha1_test.c
> > @@ -0,0 +1,65 @@
> > +/*
> > + * Copyright © 2017 Intel Corporation
> > + *
> > + * Permission is hereby granted, free of charge, to any person obtaining a
> > + * copy of this software and associated documentation files (the
> > "Software"),
> > + * to deal in the Software without restriction, including without
> > limitation
> > + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> > + * and/or sell copies of the Software, and to permit persons to whom the
> > + * Software is furnished to do so, subject to the following conditions:
> > + *
> > + * The above copyright notice and this permission notice (including the
> > next
> > + * paragraph) shall be included in all copies or substantial portions of
> > the
> > + * Software.
> > + *
> > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> > OR
> > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
> > OTHER
> > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> > DEALINGS
> > + * IN THE SOFTWARE.
> > + */
> > +
> > +#include <stdio.h>
> > +#include <stdbool.h>
> > +#include <string.h>
> > +
> > +#include "macros.h"
> > +#include "mesa-sha1.h"
> > +
> > +#define SHA1_LENGTH 40
> > +
> > +int main(int argc, char *argv[])
> > +{
> > + static const struct {
> > + const char *string;
> > + const char *sha1;
> > + } test_data[] = {
> > + {"Mesa Rocks! 273", "7fb99737373d65a73f049cdabc01e73aa6bc60f3"},
> > + {"Mesa Rocks! 300", "b2180263e37d3bed6a4be0afe41b1a82ebbcf4c3"},
> > + {"Mesa Rocks! 583", "7fb9734108a62503e8a149c1051facd7fb112d05"},
> > + };
> > +
> > + bool failed = false;
> > + int i;
> > +
> > + for (i = 0; i < ARRAY_SIZE(test_data); i++) {
> > + unsigned char sha1[20];
> > + _mesa_sha1_compute(test_data[i].string, strlen(test_data[i].string),
> > + sha1);
> > +
> > + char buf[41];
>
> s/41/SHA1_LENGTH+1/ maybe?
>
> With meson added:
> Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com>
>
> > + _mesa_sha1_format(buf, sha1);
> > +
> > + if (memcmp(test_data[i].sha1, buf, SHA1_LENGTH) != 0) {
> > + printf("For string \"%s\", length %zu:\n"
> > + "\tExpected: %s\n\t Got: %s\n",
> > + test_data[i].string, strlen(test_data[i].string),
> > + test_data[i].sha1, buf);
> > + failed = true;
> > + }
> > + }
> > +
> > + return failed;
> > +}
> > --
> > 2.13.6
> >
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
