From 2860b21ee1b86d6c944308a8be181c91bc07fd03 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Nov 2010 14:10:40 +0000 Subject: [PATCH] haskell: Combine tests to reduce number of launches. --- .gitignore | 3 +-- .../{Guestfs050LVCreate.hs => Guestfs010Basic.hs} | 6 ++--- haskell/Guestfs010Launch.hs | 31 ---------------------- haskell/Makefile.am | 11 +++----- 4 files changed, 7 insertions(+), 44 deletions(-) rename haskell/{Guestfs050LVCreate.hs => Guestfs010Basic.hs} (93%) delete mode 100644 haskell/Guestfs010Launch.hs diff --git a/.gitignore b/.gitignore index 21ddd26..ac540a2 100644 --- a/.gitignore +++ b/.gitignore @@ -113,8 +113,7 @@ guestfsd-in-wine.log haskell/Bindtests haskell/Bindtests.hs haskell/Guestfs005Load -haskell/Guestfs010Launch -haskell/Guestfs050LVCreate +haskell/Guestfs010Basic haskell/Guestfs.hs *.hi html/guestfish.1.html diff --git a/haskell/Guestfs050LVCreate.hs b/haskell/Guestfs010Basic.hs similarity index 93% rename from haskell/Guestfs050LVCreate.hs rename to haskell/Guestfs010Basic.hs index 502f6b2..6454d69 100644 --- a/haskell/Guestfs050LVCreate.hs +++ b/haskell/Guestfs010Basic.hs @@ -1,5 +1,5 @@ {- libguestfs Haskell bindings - Copyright (C) 2009 Red Hat Inc. + Copyright (C) 2009-2010 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 @@ -16,7 +16,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -} -module Guestfs050LVCreate where +module Guestfs010Basic where import qualified Guestfs import System.IO (openFile, hClose, hSetFileSize, IOMode(WriteMode)) import System.Posix.Files (removeLink) @@ -36,6 +36,4 @@ main = do -- Guestfs.lvs g and check returned list - Guestfs.sync g - removeLink "test.img" diff --git a/haskell/Guestfs010Launch.hs b/haskell/Guestfs010Launch.hs deleted file mode 100644 index 930d666..0000000 --- a/haskell/Guestfs010Launch.hs +++ /dev/null @@ -1,31 +0,0 @@ -{- 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. --} - -module Guestfs010Launch where -import qualified Guestfs -import System.IO (openFile, hClose, hSetFileSize, IOMode(WriteMode)) -import System.Posix.Files (removeLink) - -main = do - g <- Guestfs.create - fd <- openFile "test.img" WriteMode - hSetFileSize fd (500 * 1024 * 1024) - hClose fd - Guestfs.add_drive g "test.img" - Guestfs.launch g - removeLink "test.img" diff --git a/haskell/Makefile.am b/haskell/Makefile.am index 2524617..4406712 100644 --- a/haskell/Makefile.am +++ b/haskell/Makefile.am @@ -32,13 +32,13 @@ TESTS_ENVIRONMENT = \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ $(VG) -TESTS = run-bindtests Guestfs005Load Guestfs010Launch Guestfs050LVCreate +TESTS = run-bindtests Guestfs005Load Guestfs010Basic check_DATA = Bindtests GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs -all_targets = Bindtests Guestfs005Load Guestfs010Launch Guestfs050LVCreate +all_targets = Bindtests Guestfs005Load Guestfs010Basic $(all_targets): $(top_builddir)/src/libguestfs.la all: $(all_targets) @@ -52,12 +52,9 @@ Bindtests: Bindtests.hs Guestfs.o Guestfs005Load: Guestfs005Load.hs Guestfs.o $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs -Guestfs010Launch: Guestfs010Launch.hs Guestfs.o +Guestfs010Basic: Guestfs010Basic.hs Guestfs.o $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs -Guestfs050LVCreate: Guestfs050LVCreate.hs Guestfs.o - $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs - -CLEANFILES = $(all_targets) *~ Guestfs.o +CLEANFILES = $(all_targets) *~ *.hi *.o endif -- 1.8.3.1