Automatically create and load dictionaries

...for the tests that need them (currently, all nested `std::set` and
friends).

Author: enirolf

Makefile

@@ -5,17 +5,23 @@ endif
 
 .PHONY: all
 all:
+	$(MAKE) dict
 	$(MAKE) write
 	$(MAKE) read
 
 # This assumes there is no whitespace in any of the paths...
+DICT_MAKEFILE_DIR := $(sort $(shell find */ -name Makefile -printf "%h\n"))
 WRITE_C := $(sort $(shell find . -name write.C))
 READ_C := $(sort $(shell find . -name read.C))
 
+.PHONY: dict
+dict:
+	@$(foreach d,$(DICT_MAKEFILE_DIR),make -C $(d) &&) true
+
 .PHONY: write
 write:
-	@$(foreach c,$(WRITE_C),$(ROOT_EXE) -q -l $(c) &&) true
+	@$(foreach c,$(WRITE_C),LD_LIBRARY_PATH=$(shell dirname $(c)) $(ROOT_EXE) -q -l $(c) &&) true
 
 .PHONY: read
 read:
-	@$(foreach c,$(READ_C),$(ROOT_EXE) -q -l $(c) &&) true
+	@$(foreach c,$(READ_C),LD_LIBRARY_PATH=$(shell dirname $(c)) $(ROOT_EXE) -q -l $(c) &&) true

types/multiset/nested/read.C

@@ -54,12 +54,10 @@ static void PrintNestedMultisetValue(const REntry &entry, std::string_view name,
 
 void read(std::string_view input = "types.multiset.nested.root",
           std::string_view output = "types.multiset.nested.json") {
-  if (!std::filesystem::exists("libNestedMultiset.so")) {
+  if (gSystem->Load("libNestedMultiset") == -1)
     throw std::runtime_error("could not find the required ROOT dictionaries, "
                              "please make sure to run `make` first");
-  }
 
-  gSystem->Load("libNestedMultiset");
   std::ofstream os(std::string{output});
   os << "[\n";
 

types/multiset/nested/write.C

@@ -31,12 +31,9 @@ static std::shared_ptr<Multiset> MakeMultisetField(RNTupleModel &model,
 }
 
 void write(std::string_view filename = "types.multiset.nested.root") {
-  if (!std::filesystem::exists("libNestedMultiset.so")) {
+  if (gSystem->Load("libNestedMultiset") == -1)
     throw std::runtime_error("could not find the required ROOT dictionaries, "
                              "please make sure to run `make` first");
-  }
-
-  gSystem->Load("libNestedMultiset");
 
   auto model = RNTupleModel::Create();
 

types/set/nested/read.C

@@ -54,12 +54,10 @@ static void PrintNestedSetValue(const REntry &entry, std::string_view name,
 
 void read(std::string_view input = "types.set.nested.root",
           std::string_view output = "types.set.nested.json") {
-  if (!std::filesystem::exists("libNestedSet.so")) {
+  if (gSystem->Load("libNestedSet") == -1)
     throw std::runtime_error("could not find the required ROOT dictionaries, "
                              "please make sure to run `make` first");
-  }
 
-  gSystem->Load("libNestedSet");
   std::ofstream os(std::string{output});
   os << "[\n";
 

types/set/nested/write.C

@@ -31,12 +31,9 @@ static std::shared_ptr<Set> MakeSetField(RNTupleModel &model,
 }
 
 void write(std::string_view filename = "types.set.nested.root") {
-  if (!std::filesystem::exists("libNestedSet.so")) {
+  if (gSystem->Load("libNestedSet") == -1)
     throw std::runtime_error("could not find the required ROOT dictionaries, "
                              "please make sure to run `make` first");
-  }
-
-  gSystem->Load("libNestedSet");
 
   auto model = RNTupleModel::Create();
 

types/unordered_multiset/nested/read.C

@@ -69,11 +69,9 @@ static void PrintNestedUnorderedMultisetValue(const REntry &entry,
 
 void read(std::string_view input = "types.unordered_multiset.nested.root",
           std::string_view output = "types.unordered_multiset.nested.json") {
-  if (!std::filesystem::exists("libNestedUnorderedMultiset.so")) {
+  if (gSystem->Load("libNestedUnorderedMultiset") == -1)
     throw std::runtime_error("could not find the required ROOT dictionaries, "
                              "please make sure to run `make` first");
-  }
-  gSystem->Load("libNestedUnorderedMultiset");
 
   std::ofstream os(std::string{output});
   os << "[\n";

types/unordered_multiset/nested/write.C

@@ -34,11 +34,9 @@ MakeUnorderedMultisetField(RNTupleModel &model, std::string_view name,
 }
 
 void write(std::string_view filename = "types.unordered_multiset.nested.root") {
-  if (!std::filesystem::exists("libNestedUnorderedMultiset.so")) {
+  if (gSystem->Load("libNestedUnorderedMultiset") == -1)
     throw std::runtime_error("could not find the required ROOT dictionaries, "
                              "please make sure to run `make` first");
-  }
-  gSystem->Load("libNestedUnorderedMultiset");
 
   auto model = RNTupleModel::Create();
 

types/unordered_set/nested/read.C

@@ -68,11 +68,9 @@ static void PrintNestedUnorderedSetValue(const REntry &entry,
 
 void read(std::string_view input = "types.unordered_set.nested.root",
           std::string_view output = "types.unordered_set.nested.json") {
-  if (!std::filesystem::exists("libNestedUnorderedSet.so")) {
+  if (gSystem->Load("libNestedUnorderedSet") == -1)
     throw std::runtime_error("could not find the required ROOT dictionaries, "
                              "please make sure to run `make` first");
-  }
-  gSystem->Load("libNestedUnorderedSet");
 
   std::ofstream os(std::string{output});
   os << "[\n";

types/unordered_set/nested/write.C

@@ -33,11 +33,9 @@ MakeUnorderedSetField(RNTupleModel &model, std::string_view name,
 }
 
 void write(std::string_view filename = "types.unordered_set.nested.root") {
-  if (!std::filesystem::exists("libNestedUnorderedSet.so")) {
+  if (gSystem->Load("libNestedUnorderedSet") == -1)
     throw std::runtime_error("could not find the required ROOT dictionaries, "
                              "please make sure to run `make` first");
-  }
-  gSystem->Load("libNestedUnorderedSet");
 
   auto model = RNTupleModel::Create();