Make tests work when 'protoc' command is missing

alavrik · Sep 14, 2018 · 3120cf3 · 3120cf3
1 parent 88e56ac
commit 3120cf3
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 8 deletions.
diff --git a/tests/misc1/Makefile b/tests/misc1/Makefile
@@ -5,7 +5,7 @@ RESULT = t
 SOURCES = id_piqi.ml id_piqi_ext.ml example_piqi.ml example_piqi_ext.ml test.ml
 
 
-PRE_TARGETS = id.proto.piqi example.proto.piqi id_piqi.ml id_piqi_ext.ml example_piqi.ml example_piqi_ext.ml
+PRE_TARGETS = id_piqi.ml id_piqi_ext.ml example_piqi.ml example_piqi_ext.ml
 
 
 export OCAMLPATH := ../..:$(OCAMLPATH)
@@ -21,20 +21,18 @@ all: native-code test #byte-code
 
 
 test:
-	rm -f *.piqi
 	./$(RESULT)
 
 
-%.proto.piqi: %.proto
+%_piqi.ml: %.proto $(realpath $(PIQI)) $(PIQIC)
+ifneq ($(shell which protoc), )
 	$(PIQI) of-proto $<
-
-
-%_piqi.ml: %.proto.piqi
-	$(PIQIC) $(PIQIC_FLAGS) $<
+endif
+	$(PIQIC) $(PIQIC_FLAGS) $<.piqi
 
 
 clean::
-	rm -f *.tmp.ml *.piqi
+	rm -f *.tmp.ml
 
 
 include $(OCAMLMAKEFILE)
diff --git a/tests/misc1/example.proto.piqi b/tests/misc1/example.proto.piqi
@@ -0,0 +1,12 @@
+.protobuf-package "test"
+
+.import [ .module id ]
+
+.record [
+    .name example
+    .field [
+        .name id
+        .type id/Id
+        .code 1
+    ]
+]
diff --git a/tests/misc1/id.proto.piqi b/tests/misc1/id.proto.piqi
@@ -0,0 +1,10 @@
+.protobuf-package "test"
+
+.record [
+    .name Id
+    .field [
+        .name id
+        .type protobuf-int64
+        .code 1
+    ]
+]