build with make

This commit is contained in:
Ben Burdette 2020-03-30 09:14:29 -06:00
parent 759f39800b
commit 35c7bab09a
4 changed files with 24 additions and 3 deletions

View file

@ -15,7 +15,8 @@ makefiles = \
misc/upstart/local.mk \
doc/manual/local.mk \
tests/local.mk \
tests/plugins/local.mk
tests/plugins/local.mk \
tests/errors/local.mk
-include Makefile.config

View file

@ -3,6 +3,7 @@
#include "types.hh"
#include "logging.hh"
#include "ansicolor.hh"
#include "error.hh"
#include <sys/types.h>
#include <sys/stat.h>

17
tests/errors/local.mk Normal file
View file

@ -0,0 +1,17 @@
programs += error-test
error-test_DIR := $(d)
error-test_SOURCES := \
$(wildcard $(d)/*.cc) \
error-test_LIBS = libutil
error-test_LDFLAGS = -pthread $(SODIUM_LIBS) $(EDITLINE_LIBS) $(BOOST_LDFLAGS) -lboost_context -lboost_thread -lboost_system
# $(foreach name, \
# nix-build nix-channel nix-collect-garbage nix-copy-closure nix-daemon nix-env nix-hash nix-instantiate nix-prefetch-url nix-shell nix-store, \
# $(eval $(call install-symlink, nix, $(bindir)/$(name))))
# $(eval $(call install-symlink, $(bindir)/nix, $(libexecdir)/nix/build-remote))
# src/nix-env/user-env.cc: src/nix-env/buildenv.nix.gen.hh

View file

@ -12,7 +12,7 @@ int main()
{
using namespace nix;
ErrorInfo::programName = optional("errorTest");
ErrorInfo::programName = optional("error-test");
/*
ColumnRange columnRange;
@ -59,7 +59,9 @@ int main()
.columnRange(13,7)
.linesOfCode(nullopt
,"this is the problem line of code"
,nullopt));
,nullopt)
.hint(hintfmt("this hint has %1% templated %2%!!") % "yellow" % "values")
);
printErrorInfo(MkNixError()
.name("error name")