forked from OctaForge/libostd
slight cleanup
This commit is contained in:
parent
2bc3c94daa
commit
3c708e780d
1
Makefile
1
Makefile
|
@ -11,7 +11,6 @@ EXAMPLES_OBJ = \
|
||||||
all: examples
|
all: examples
|
||||||
|
|
||||||
examples: $(EXAMPLES_OBJ)
|
examples: $(EXAMPLES_OBJ)
|
||||||
test_runner: test_runner.o
|
|
||||||
|
|
||||||
.cc:
|
.cc:
|
||||||
$(CXX) $(CXXFLAGS) $(OSTD_CXXFLAGS) -o $@ $<
|
$(CXX) $(CXXFLAGS) $(OSTD_CXXFLAGS) -o $@ $<
|
||||||
|
|
|
@ -40,20 +40,17 @@ int main() {
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
String cxxf = cxxflags;
|
ConstCharRange userflags = get_env("CXXFLAGS", "");
|
||||||
cxxf += get_env("CXXFLAGS", "");
|
|
||||||
|
|
||||||
int nsuccess = 0, nfailed = 0;
|
int nsuccess = 0, nfailed = 0;
|
||||||
|
|
||||||
auto print_result = [&colors, &nsuccess, &nfailed]
|
auto print_result = [&colors, &nsuccess, &nfailed]
|
||||||
(ConstCharRange modname, ConstCharRange fmsg = nullptr) {
|
(ConstCharRange modname, ConstCharRange fmsg = nullptr) {
|
||||||
|
write(modname, "...\t");
|
||||||
if (!fmsg.empty()) {
|
if (!fmsg.empty()) {
|
||||||
writeln(modname, "...\t", colors["red"], colors["bold"],
|
writeln(colors["red"], colors["bold"], "(", fmsg, ")", colors["end"]);
|
||||||
"(", fmsg, ")", colors["end"]);
|
|
||||||
++nfailed;
|
++nfailed;
|
||||||
} else {
|
} else {
|
||||||
writeln(modname, "...\t", colors["green"], colors["bold"],
|
writeln(colors["green"], colors["bold"], "(success)", colors["end"]);
|
||||||
"(success)", colors["end"]);
|
|
||||||
++nsuccess;
|
++nsuccess;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -77,7 +74,11 @@ int main() {
|
||||||
cxxcmd += " -o ";
|
cxxcmd += " -o ";
|
||||||
cxxcmd += exepath;
|
cxxcmd += exepath;
|
||||||
cxxcmd += " ";
|
cxxcmd += " ";
|
||||||
cxxcmd += cxxf;
|
cxxcmd += cxxflags;
|
||||||
|
if (!userflags.empty()) {
|
||||||
|
cxxcmd += " ";
|
||||||
|
cxxcmd += userflags;
|
||||||
|
}
|
||||||
|
|
||||||
int ret = system(cxxcmd.data());
|
int ret = system(cxxcmd.data());
|
||||||
if (ret) {
|
if (ret) {
|
||||||
|
|
Loading…
Reference in a new issue