Re: [Libosinfo] [PATCH] freedos: add freedos 1.2 test data

2018-02-14 Thread Christophe Fergeau 
On Wed, Feb 14, 2018 at 12:23:51PM +0100, Christophe Fergeau wrote:
> 
> Acked-by: Christophe Fergeau 

Actually, this was missing
diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
index 1f6e5504..56dfb440 100644
--- a/tests/test-isodetect.c
+++ b/tests/test-isodetect.c
@@ -460,6 +460,12 @@ test_sled(void)
 test_one("sled");
 }

+static void
+test_freedos(void)
+{
+test_one("freedos");
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -479,6 +485,7 @@ main(int argc, char *argv[])
 g_test_add_func("/isodetect/mageia", test_mageia);
 g_test_add_func("/isodetect/sles", test_sles);
 g_test_add_func("/isodetect/sled", test_sled);
+g_test_add_func("/isodetect/freedos", test_freedos);

 /* Upfront so we don't confuse valgrind */
 osinfo_entity_get_type();

and then the tests were failing because the directory hierarchy should
be tests/isodata/freedos/freedos12.
I've squashed that in your commit and pushed.


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [PATCH] freedos: add freedos-1.2

2018-02-14 Thread Christophe Fergeau 
Looks good,
Acked-by: Christophe Fergeau 

On Fri, Feb 02, 2018 at 04:26:31PM +0100, Felipe Borges wrote:
> http://www.freedos.org
> ---
>  data/os/freedos.org/freedos-1.2.xml.in | 53 
> ++
>  1 file changed, 53 insertions(+)
>  create mode 100644 data/os/freedos.org/freedos-1.2.xml.in
> 
> diff --git a/data/os/freedos.org/freedos-1.2.xml.in 
> b/data/os/freedos.org/freedos-1.2.xml.in
> new file mode 100644
> index 000..c4dee6a
> --- /dev/null
> +++ b/data/os/freedos.org/freedos-1.2.xml.in
> @@ -0,0 +1,53 @@
> +
> +
> +  http://freedos.org/freedos/1.2;>
> +freedos1.2
> +<_name>FreeDOS 1.2
> +1.2
> +<_vendor>FreeDOS
> +linux
> +freedos
> +
> +2016-12-25
> +
> +
> +  <_name>FreeDOS 1.2 "Standard" Installer
> +
> +
> +  <_name>FreeDOS 1.2 "Legacy" Installer
> +
> +
> +
> +  
> +  http://www.freedos.org/download/download/FD12CD.iso
> +  
> +FD-SETUP
> +LINUX
> +  
> +
> +
> +
> +  
> +  http://www.freedos.org/download/download/FD12LGCY.iso
> +  
> +FDI-CD
> +LINUX
> +  
> +
> +
> +
> +  
> +1
> +10
> +33554432
> +209715200
> +  
> +
> +  
> +67108864
> +419430400
> +  
> +
> +  
> +
> -- 
> 2.14.3
> 
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [PATCH] pop_os: add Pop!_OS 17.10 data

2018-02-14 Thread Christophe Fergeau 
Hey,

On Fri, Feb 02, 2018 at 06:31:06PM +0100, Felipe Borges wrote:
> https://system76.com/pop
> 
> Pop!_OS is based on Ubuntu. It follows the Ubuntu version numbers
> and release schedule. The first version, 17.10, shipped on October
> 19th, 2017. There will be a new release every six months.
> ---
>  data/os/system76.com/popos-17.10.xml.in | 55 
> +
>  1 file changed, 55 insertions(+)
>  create mode 100644 data/os/system76.com/popos-17.10.xml.in
> 
> diff --git a/data/os/system76.com/popos-17.10.xml.in 
> b/data/os/system76.com/popos-17.10.xml.in
> new file mode 100644
> index 000..23c1ade
> --- /dev/null
> +++ b/data/os/system76.com/popos-17.10.xml.in
> @@ -0,0 +1,55 @@
> +
> +
> +  http://system76.com/popos/17.10;>
> +popos17.10
> +popos17.10

Duplicate short id

> +<_name>Pop!_OS 17.10
> +17.10
> +<_vendor>System76, Inc.
> +linux
> +popos
> +
> +2017-10-19
> +
> +
> +  <_name>Pop!_OS 17.10 (NVIDIA)
> +
> +
> +  <_name>Pop!_OS 17.10 (Intel/AMD)
> +
> +
> +
> +  
> +10
> +1
> +1073741824
> +5368709120
> +  
> +  
> +10
> +1073741824
> +16106127360
> +  
> +
> +
> +
> +  
> +  
> https://d1vhcvzji58n1j.cloudfront.net/pop-os/iso/nvidia/46/pop-os_amd64_nvidia_46.iso
> +  
> +Pop_OS 17.10 amd64
> +  
> +  install/vmlinuz
> +  install/initrd.gz
> +
> +
> +  
> +  
> https://d1vhcvzji58n1j.cloudfront.net/pop-os/iso/intel/57/pop-os_amd64_intel_57.iso
> +  
> +Pop_OS 17.10 amd64
> +  

You'll need to use  to make it possible to differentiate
between the intel and nvidia variants.

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [PATCH] NetBSD: add NetBSD 6.x / 7.x data

2018-02-14 Thread Christophe Fergeau 
On Wed, Feb 14, 2018 at 11:44:48AM +0100, Christophe Fergeau wrote:
> Hey Vicente, thanks for the patches!
> 
> Could you also provide a patch for libosinfo to add test data for these
> ISOs? You can generate them with
> "iso_name=./NetBSD-6.0-amd64.iso isoinfo -d -i $iso_name >$iso_name.txt"
> 
> On Tue, Feb 06, 2018 at 03:13:59PM -0200, Vicente Chaves de Melo wrote:
> > ---
> >  data/os/netbsd.org/netbsd-6.0.xml.in | 75 
> > 
> >  data/os/netbsd.org/netbsd-6.1.xml.in | 75 
> > 
> >  data/os/netbsd.org/netbsd-7.0.xml.in | 75 
> > 
> >  data/os/netbsd.org/netbsd-7.1.xml.in | 75 
> > 
> >  4 files changed, 300 insertions(+)
> >  create mode 100644 data/os/netbsd.org/netbsd-6.0.xml.in
> >  create mode 100644 data/os/netbsd.org/netbsd-6.1.xml.in
> >  create mode 100644 data/os/netbsd.org/netbsd-7.0.xml.in
> >  create mode 100644 data/os/netbsd.org/netbsd-7.1.xml.in
> > 
> > diff --git a/data/os/netbsd.org/netbsd-6.0.xml.in 
> > b/data/os/netbsd.org/netbsd-6.0.xml.in
> > new file mode 100644
> > index 000..9897d59
> > --- /dev/null
> > +++ b/data/os/netbsd.org/netbsd-6.0.xml.in
> > @@ -0,0 +1,75 @@
> > +
> > +
> > +
> > +  http://netbsd.org/netbsd/6.0;>
> > +netbsd6.0
> > +NetBSD 6.0
> > +NetBSD 6.0
> > +NetBSD 6.0
> > +NetBSD 6.0
> > +NetBSD 6.0
> > +NetBSD 6.0
> > +NetBSD 6.0
> > +NetBSD 6.0
> > +NetBSD 6.0
> 
> The translations do not belong in the .xml.in files, but in the .po
> files. They are then merged in the XML data as part of the .xml.in ->
> .xml transformation.

Forgot to mention that you need to annotate the xml tag with a _:
<_name>NetBSD 6.0 to mark it for translation.

Christophe


signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo

Re: [Libosinfo] [libosinfo] tests: Remove calls to g_log_set_always_fatal()

2018-02-14 Thread Christophe Fergeau 
Ping?

Christophe

On Mon, Jan 15, 2018 at 01:08:13PM +0100, Christophe Fergeau wrote:
> All tests call that method because they want g_warning() to be fatal.
> Since the switch to GTest, this is no longer necessary as this is the
> default  behaviour.
> 
> Signed-off-by: Christophe Fergeau 
> ---
>  tests/test-db.c | 3 ---
>  tests/test-device.c | 3 ---
>  tests/test-devicelist.c | 3 ---
>  tests/test-entity.c | 3 ---
>  tests/test-filter.c | 3 ---
>  tests/test-install-script.c | 3 ---
>  tests/test-isodetect.c  | 3 ---
>  tests/test-list.c   | 3 ---
>  tests/test-loader.c | 3 ---
>  tests/test-mediauris.c  | 3 ---
>  tests/test-os.c | 3 ---
>  tests/test-oslist.c | 3 ---
>  tests/test-platform.c   | 3 ---
>  tests/test-platformlist.c   | 3 ---
>  tests/test-product.c| 3 ---
>  tests/test-productfilter.c  | 3 ---
>  tests/test-treeuris.c   | 3 ---
>  17 files changed, 51 deletions(-)
> 
> diff --git a/tests/test-db.c b/tests/test-db.c
> index ac0a529b..553cea2e 100644
> --- a/tests/test-db.c
> +++ b/tests/test-db.c
> @@ -411,9 +411,6 @@ main(int argc, char *argv[])
>  g_test_add_func("/db/prop_os", test_prop_os);
>  g_test_add_func("/db/rel_os", test_rel_os);
>  
> -/* Make sure we catch unexpected g_warning() */
> -g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | 
> G_LOG_LEVEL_WARNING);
> -
>  /* Upfront so we don't confuse valgrind */
>  osinfo_entity_get_type();
>  osinfo_db_get_type();
> diff --git a/tests/test-device.c b/tests/test-device.c
> index f14eebab..064ccc27 100644
> --- a/tests/test-device.c
> +++ b/tests/test-device.c
> @@ -44,9 +44,6 @@ main(int argc, char *argv[])
>  
>  g_test_add_func("/device/basic", test_basic);
>  
> -/* Make sure we catch unexpected g_warning() */
> -g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | 
> G_LOG_LEVEL_WARNING);
> -
>  /* Upfront so we don't confuse valgrind */
>  osinfo_device_get_type();
>  
> diff --git a/tests/test-devicelist.c b/tests/test-devicelist.c
> index cd697934..0c9e3e85 100644
> --- a/tests/test-devicelist.c
> +++ b/tests/test-devicelist.c
> @@ -213,9 +213,6 @@ main(int argc, char *argv[])
>  g_test_add_func("/devicelist/intersect", test_intersect);
>  g_test_add_func("/devicelist/filter", test_filter);
>  
> -/* Make sure we catch unexpected g_warning() */
> -g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | 
> G_LOG_LEVEL_WARNING);
> -
>  /* Upfront so we don't confuse valgrind */
>  osinfo_device_get_type();
>  osinfo_devicelist_get_type();
> diff --git a/tests/test-entity.c b/tests/test-entity.c
> index 5f7233b8..b89f0b5a 100644
> --- a/tests/test-entity.c
> +++ b/tests/test-entity.c
> @@ -323,9 +323,6 @@ main(int argc, char *argv[])
>  g_test_add_func("/entity/multi_props_clear", test_multi_props_clear);
>  g_test_add_func("/entity/int64_props", test_int64_props);
>  
> -/* Make sure we catch unexpected g_warning() */
> -g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | 
> G_LOG_LEVEL_WARNING);
> -
>  /* Upfront so we don't confuse valgrind */
>  osinfo_dummy_get_type();
>  
> diff --git a/tests/test-filter.c b/tests/test-filter.c
> index 3fbeb3e2..9afbc7fb 100644
> --- a/tests/test-filter.c
> +++ b/tests/test-filter.c
> @@ -161,9 +161,6 @@ main(int argc, char *argv[])
>  g_test_add_func("/filter/filter_multi", test_filter_multi);
>  g_test_add_func("/filter/filter_combine", test_filter_combine);
>  
> -/* Make sure we catch unexpected g_warning() */
> -g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | 
> G_LOG_LEVEL_WARNING);
> -
>  /* Upfront so we don't confuse valgrind */
>  osinfo_device_get_type();
>  osinfo_filter_get_type();
> diff --git a/tests/test-install-script.c b/tests/test-install-script.c
> index fa692a39..bb9e79a5 100644
> --- a/tests/test-install-script.c
> +++ b/tests/test-install-script.c
> @@ -309,9 +309,6 @@ main(int argc, char *argv[])
>  g_test_add_func("/install-script/script_data", test_script_data);
>  g_test_add_func("/install-script/script_datamap", test_script_datamap);
>  
> -/* Make sure we catch unexpected g_warning() */
> -g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | 
> G_LOG_LEVEL_WARNING);
> -
>  /* Upfront so we don't confuse valgrind */
>  osinfo_entity_get_type();
>  osinfo_db_get_type();
> diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
> index 51137284..1f6e5504 100644
> --- a/tests/test-isodetect.c
> +++ b/tests/test-isodetect.c
> @@ -480,9 +480,6 @@ main(int argc, char *argv[])
>  g_test_add_func("/isodetect/sles", test_sles);
>  g_test_add_func("/isodetect/sled", test_sled);
>  
> -/* Make sure we catch unexpected g_warning() */
> -g_log_set_always_fatal(G_LOG_LEVEL_ERROR |