Permalink
Browse files

Build code coverage with "bisect", separately. Tweak the syntax for c…

…amlp4o.

camlp4o doesn't accept [| _; |] pattern matching; it wants [| _ |] .
Certainly a syntax bug. bisect requires camlp4o.

Test case:

    camlp4o -str 'let [ x; ] = [ 5; ]'
    camlp4o -str 'let [| x; |] = [| 5; |]'

Bug:
http://caml.inria.fr/mantis/view.php?id=4938
  • Loading branch information...
1 parent e7190d8 commit 53dc383b7796de83ae0442d1d5cbdbed99770506 @g2p committed Feb 10, 2010
Showing with 99 additions and 78 deletions.
  1. +26 −12 .gitignore
  2. +9 −60 OMakefile
  3. 0 build/.keep
  4. 0 deps/.keep
  5. 0 profile/.keep
  6. +58 −0 src/OMakefile
  7. +6 −6 { → src}/git_fs.ml
View
@@ -1,16 +1,30 @@
-/batteries-included
-/libfuse-ocaml
-/lwt-2.0.0
-/ocamlfuse
-/ocaml-git
+/build/git-fs
+/build/git_fs.cmi
+/build/git_fs.cmo
+/build/git_fs.cmx
+/build/git_fs.ml
+/build/git_fs.o
+/build/git-fs.opt
+/build/git-fs.run
+/build/OMakefile
+/build/OMakefile.omc
+/deps/batteries-included
+/deps/libfuse-ocaml
+/deps/lwt-2.0.0
+/deps/ocamlfuse
+/deps/ocaml-git
/.omakedb
/.omakedb.lock
/OMakefile.omc
/OMakeroot.omc
-/git-fs
-/git_fs.cmi
-/git_fs.cmo
-/git_fs.cmx
-/git_fs.o
-/git-fs.opt
-/git-fs.run
+/profile/git-fs
+/profile/git_fs.cmi
+/profile/git_fs.cmo
+/profile/git_fs.cmp
+/profile/git_fs.cmx
+/profile/git_fs.ml
+/profile/git_fs.o
+/profile/git-fs.opt
+/profile/git-fs.run
+/profile/OMakefile
+/profile/OMakefile.omc
View
@@ -1,65 +1,14 @@
-########################################################################
-# Phony targets are scoped, so you probably want to declare them first.
-#
-
-# .PHONY: all install clean
-
-########################################################################
-# Subdirectories.
-# You may want to include some subdirectories in this project.
-# If so, define the subdirectory targets and uncomment this section.
-#
-
-# .SUBDIRS:
-
-USE_OCAMLFIND = true
-
-OCAMLPACKS[] =
- batteries
- bigarray
+#OCAMLPACKS[] =
#OCAMLFINDFLAGS =
-if $(not $(OCAMLFIND_EXISTS))
- eprintln(This project requires ocamlfind, but is was not found.)
- eprintln(You need to install ocamlfind and run "omake --configure".)
- exit 1
-
-#
-# Include path
-#
-OCAMLINCLUDES += ocamlfuse/lib
-
-#
-# Compile native or byte code?
-#
-# The default values are defined as follows:
-#
-# NATIVE_ENABLED = $(OCAMLOPT_EXISTS)
-# BYTE_ENABLED = $(not $(OCAMLOPT_EXISTS))
-
-#
-# Various options
-#
-OCAMLFLAGS += -thread
-# OCAMLCFLAGS +=
-# OCAMLOPTFLAGS +=
-# OCAML_LINK_FLAGS +=
-# OCAML_BYTE_LINK_FLAGS +=
-# OCAML_NATIVE_LINK_FLAGS +=
-
-################################################
-# Build an OCaml program
-#
-
-FILES[] =
- git_fs
-
-PROGRAM = git-fs
-# OCAML_LIBS +=
-# OCAML_CLIBS +=
-OCAML_OTHER_LIBS += Fuse
-OCAML_LIB_FLAGS += -ccopt -Locamlfuse/lib
+section
+ vmount(-l, src, build)
+ .SUBDIRS: build
-.DEFAULT: $(OCamlProgram $(PROGRAM), $(FILES))
+section
+ vmount(-l, src, profile)
+ OCAMLPACKS[] += bisect
+ OCAMLFINDFLAGS += -syntax camlp4o
+ .SUBDIRS: profile
View
No changes.
View
No changes.
View
No changes.
View
@@ -0,0 +1,58 @@
+
+########################################################################
+# Phony targets are scoped, so you probably want to declare them first.
+#
+
+# .PHONY: all install clean
+
+USE_OCAMLFIND = true
+
+OCAMLPACKS[] +=
+ batteries
+ bigarray
+
+#OCAMLFINDFLAGS +=
+
+if $(not $(OCAMLFIND_EXISTS))
+ eprintln(This project requires ocamlfind, but is was not found.)
+ eprintln(You need to install ocamlfind and run "omake --configure".)
+ exit 1
+
+#
+# Include path
+#
+OCAMLINCLUDES += ../deps/ocamlfuse/lib
+
+#
+# Compile native or byte code?
+#
+# The default values are defined as follows:
+#
+# NATIVE_ENABLED = $(OCAMLOPT_EXISTS)
+# BYTE_ENABLED = $(not $(OCAMLOPT_EXISTS))
+
+#
+# Various options
+#
+OCAMLFLAGS += -thread
+# OCAMLCFLAGS +=
+# OCAMLOPTFLAGS +=
+# OCAML_LINK_FLAGS +=
+# OCAML_BYTE_LINK_FLAGS +=
+# OCAML_NATIVE_LINK_FLAGS +=
+
+################################################
+# Build an OCaml program
+#
+
+FILES[] =
+ git_fs
+
+PROGRAM = git-fs
+# OCAML_LIBS +=
+# OCAML_CLIBS +=
+OCAML_OTHER_LIBS += Fuse
+OCAML_LIB_FLAGS += -ccopt -L../deps/ocamlfuse/lib
+
+.DEFAULT: $(OCamlProgram $(PROGRAM), $(FILES))
+
@@ -514,11 +514,11 @@ let cmd_fuse_help () =
let _ =
match Sys.argv with
- |[| _; |] -> cmd_mount ()
- |[| _; "mount"; |] -> cmd_mount ()
- |[| _; "umount"; |] -> cmd_umount ()
- |[| _; "show-mountpoint"; |] -> cmd_show_mountpoint ()
- |[| _; "help"; |] -> cmd_help ()
- |[| _; "fuse-help"; |] -> cmd_fuse_help () (* For developer use *)
+ |[| _ |] -> cmd_mount ()
+ |[| _; "mount" |] -> cmd_mount ()
+ |[| _; "umount" |] -> cmd_umount ()
+ |[| _; "show-mountpoint" |] -> cmd_show_mountpoint ()
+ |[| _; "help" |] -> cmd_help ()
+ |[| _; "fuse-help" |] -> cmd_fuse_help () (* For developer use *)
|_ -> begin usage (); exit 2; end

0 comments on commit 53dc383

Please sign in to comment.