Re: [Mesa-dev] [PATCH] meson: build mesa test.
Quoting Eric Anholt (2017-10-13 16:58:01) > Dylan Bakerwrites: > > > Signed-off-by: Dylan Baker > > --- > > src/mesa/main/tests/meson.build | 44 > > + > > src/mesa/meson.build| 3 +++ > > 2 files changed, 47 insertions(+) > > create mode 100644 src/mesa/main/tests/meson.build > > > > diff --git a/src/mesa/main/tests/meson.build > > b/src/mesa/main/tests/meson.build > > new file mode 100644 > > index 000..cac87d8dcac > > --- /dev/null > > +++ b/src/mesa/main/tests/meson.build > > @@ -0,0 +1,44 @@ > > +# 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 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. > > + > > +files_main_test = files('enum_strings.cpp') > > +link_main_test = [] > > + > > +if with_shared_glapi > > + files_main_test += files( > > +'dispatch_sanity.cpp', > > +'mesa_formats.cpp', > > +'mesa_extensions.cpp', > > +'program_state_string.cpp', > > + ) > > + link_main_test += libglapi > > +else > > + files_main_test += files('stub.cpp') > > +endif > > + > > +main_test = executable( > > + 'main_test', > > + files_main_test, > > + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa], > > + dependencies : [idep_gtest, dep_clock, dep_dl, dep_thread], > > + link_with : [libmesa_classic, link_main_test], > > +) > > + > > +test('main-test', main_test) > > I still find the extra temp variable strange. Regardless, I'll drop the temp variable before I push. > Reviewed-by: Eric Anholt Thanks! Dylan signature.asc Description: signature ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] meson: build mesa test.
Dylan Bakerwrites: > Signed-off-by: Dylan Baker > --- > src/mesa/main/tests/meson.build | 44 > + > src/mesa/meson.build| 3 +++ > 2 files changed, 47 insertions(+) > create mode 100644 src/mesa/main/tests/meson.build > > diff --git a/src/mesa/main/tests/meson.build b/src/mesa/main/tests/meson.build > new file mode 100644 > index 000..cac87d8dcac > --- /dev/null > +++ b/src/mesa/main/tests/meson.build > @@ -0,0 +1,44 @@ > +# 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 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. > + > +files_main_test = files('enum_strings.cpp') > +link_main_test = [] > + > +if with_shared_glapi > + files_main_test += files( > +'dispatch_sanity.cpp', > +'mesa_formats.cpp', > +'mesa_extensions.cpp', > +'program_state_string.cpp', > + ) > + link_main_test += libglapi > +else > + files_main_test += files('stub.cpp') > +endif > + > +main_test = executable( > + 'main_test', > + files_main_test, > + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa], > + dependencies : [idep_gtest, dep_clock, dep_dl, dep_thread], > + link_with : [libmesa_classic, link_main_test], > +) > + > +test('main-test', main_test) I still find the extra temp variable strange. Regardless, Reviewed-by: Eric Anholt signature.asc Description: PGP signature ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] meson: build mesa test.
Signed-off-by: Dylan Baker--- src/mesa/main/tests/meson.build | 44 + src/mesa/meson.build| 3 +++ 2 files changed, 47 insertions(+) create mode 100644 src/mesa/main/tests/meson.build diff --git a/src/mesa/main/tests/meson.build b/src/mesa/main/tests/meson.build new file mode 100644 index 000..cac87d8dcac --- /dev/null +++ b/src/mesa/main/tests/meson.build @@ -0,0 +1,44 @@ +# 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 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. + +files_main_test = files('enum_strings.cpp') +link_main_test = [] + +if with_shared_glapi + files_main_test += files( +'dispatch_sanity.cpp', +'mesa_formats.cpp', +'mesa_extensions.cpp', +'program_state_string.cpp', + ) + link_main_test += libglapi +else + files_main_test += files('stub.cpp') +endif + +main_test = executable( + 'main_test', + files_main_test, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa], + dependencies : [idep_gtest, dep_clock, dep_dl, dep_thread], + link_with : [libmesa_classic, link_main_test], +) + +test('main-test', main_test) diff --git a/src/mesa/meson.build b/src/mesa/meson.build index c96105faae4..b40146c0984 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -579,3 +579,6 @@ libmesa_classic = static_library( # TODO: gallium subdir('drivers/dri') +if with_tests + subdir('main/tests') +endif -- 2.14.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev