diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | haskell/Bindtests.hs | 40 | ||||
| -rw-r--r-- | haskell/Makefile.am | 9 | ||||
| -rw-r--r-- | haskell/bindtests.hs | 0 | ||||
| -rwxr-xr-x | haskell/run-bindtests | 23 | ||||
| -rwxr-xr-x | src/generator.ml | 35 |
6 files changed, 104 insertions, 4 deletions
@@ -54,6 +54,7 @@ examples/to-xml fish/guestfish guestfish.1 guestfs.3 +haskell/Bindtests haskell/Guestfs005Load haskell/Guestfs010Launch haskell/Guestfs050LVCreate diff --git a/haskell/Bindtests.hs b/haskell/Bindtests.hs new file mode 100644 index 00000000..43f43d40 --- /dev/null +++ b/haskell/Bindtests.hs @@ -0,0 +1,40 @@ +{- libguestfs generated file + WARNING: THIS FILE IS GENERATED BY 'src/generator.ml'. + ANY CHANGES YOU MAKE TO THIS FILE WILL BE LOST. + + Copyright (C) 2009 Red Hat Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +-} + +module Bindtests where +import qualified Guestfs + +main = do + g <- Guestfs.create + Guestfs.test0 g "abc" (Just "def") [] False 0 "123" "456" + Guestfs.test0 g "abc" Nothing [] False 0 "123" "456" + Guestfs.test0 g "" (Just "def") [] False 0 "123" "456" + Guestfs.test0 g "" (Just "") [] False 0 "123" "456" + Guestfs.test0 g "abc" (Just "def") ["1"] False 0 "123" "456" + Guestfs.test0 g "abc" (Just "def") ["1","2"] False 0 "123" "456" + Guestfs.test0 g "abc" (Just "def") ["1"] True 0 "123" "456" + Guestfs.test0 g "abc" (Just "def") ["1"] False (-1) "123" "456" + Guestfs.test0 g "abc" (Just "def") ["1"] False (-2) "123" "456" + Guestfs.test0 g "abc" (Just "def") ["1"] False 1 "123" "456" + Guestfs.test0 g "abc" (Just "def") ["1"] False 2 "123" "456" + Guestfs.test0 g "abc" (Just "def") ["1"] False 4095 "123" "456" + Guestfs.test0 g "abc" (Just "def") ["1"] False 0 "" "" + putStrLn "EOF" diff --git a/haskell/Makefile.am b/haskell/Makefile.am index 1086ee97..3cb721fb 100644 --- a/haskell/Makefile.am +++ b/haskell/Makefile.am @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -EXTRA_DIST = *.hs +EXTRA_DIST = *.hs run-bindtests CLEANFILES = *~ @@ -26,10 +26,15 @@ TESTS_ENVIRONMENT = \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ $(VG) -TESTS = Guestfs005Load Guestfs010Launch Guestfs050LVCreate +TESTS = run-bindtests Guestfs005Load Guestfs010Launch Guestfs050LVCreate + +check_DATA = Bindtests GHCFLAGS = -I$(abs_top_builddir)/src -L$(abs_top_builddir)/src/.libs +Bindtests: Bindtests.hs Guestfs.hs + $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs + Guestfs005Load: Guestfs005Load.hs Guestfs.hs $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs diff --git a/haskell/bindtests.hs b/haskell/bindtests.hs deleted file mode 100644 index e69de29b..00000000 --- a/haskell/bindtests.hs +++ /dev/null diff --git a/haskell/run-bindtests b/haskell/run-bindtests new file mode 100755 index 00000000..ce01af9b --- /dev/null +++ b/haskell/run-bindtests @@ -0,0 +1,23 @@ +#!/bin/sh - +# libguestfs Haskell bindings +# Copyright (C) 2009 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +set -e + +./Bindtests > bindtests.tmp +diff -u ../bindtests bindtests.tmp + diff --git a/src/generator.ml b/src/generator.ml index 9c0632ef..1342c38e 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -7806,7 +7806,38 @@ public class Bindtests { " and generate_haskell_bindtests () = - () (* XXX Haskell bindings need to be fleshed out. *) + generate_header HaskellStyle GPLv2; + + pr "\ +module Bindtests where +import qualified Guestfs + +main = do + g <- Guestfs.create +"; + + let mkargs args = + String.concat " " ( + List.map ( + function + | CallString s -> "\"" ^ s ^ "\"" + | CallOptString None -> "Nothing" + | CallOptString (Some s) -> sprintf "(Just \"%s\")" s + | CallStringList xs -> + "[" ^ String.concat "," (List.map (sprintf "\"%s\"") xs) ^ "]" + | CallInt i when i < 0 -> "(" ^ string_of_int i ^ ")" + | CallInt i -> string_of_int i + | CallBool true -> "True" + | CallBool false -> "False" + ) args + ) + in + + generate_lang_bindtests ( + fun f args -> pr " Guestfs.%s g %s\n" f (mkargs args) + ); + + pr " putStrLn \"EOF\"\n" (* Language-independent bindings tests - we do it this way to * ensure there is parity in testing bindings across all languages. @@ -8036,7 +8067,7 @@ Run it from the top source directory using the command generate_haskell_hs (); close (); - let close = output_to "haskell/bindtests.hs" in + let close = output_to "haskell/Bindtests.hs" in generate_haskell_bindtests (); close (); |