Commit d29f8496 authored by Sergey Lyubka's avatar Sergey Lyubka

Fixed optional build test

parent 848c5d75
...@@ -159,7 +159,7 @@ release: tarball macos ...@@ -159,7 +159,7 @@ release: tarball macos
zip -r mongoose-php-$(VERSION).zip mongoose_php_bundle/ zip -r mongoose-php-$(VERSION).zip mongoose_php_bundle/
clean: clean:
cd ../examples && $(MAKE) clean @cd ../examples && $(MAKE) clean
rm -rf *.o *.core $(PROG) *.obj *.so $(PROG).txt *.dSYM *.tgz \ @rm -rf *.o *.core $(PROG) *.obj *.so $(PROG).txt *.dSYM *.tgz \
$(PROG).exe *.dll *.lib res.o res.RES *.dSYM *.zip *.pdb \ $(PROG).exe *.dll *.lib res.o res.RES *.dSYM *.zip *.pdb \
*.exe *dmg* $(PROG)-* unix_unit_test *.exe *dmg* $(PROG)-* unix_unit_test
#!/usr/bin/env perl #!/usr/bin/env perl
use Data::Dumper;
@flags = ("NO_POPEN", "NO_SSL", "NDEBUG", "DEBUG", "NO_CGI"); @flags = split /\s+/,
`egrep -o 'NO_[A-Z0-9_]*|USE_[A-Z0-9_]*' ../mongoose.c | sort | uniq`;
#@flags = ("NO_POPEN", "NO_SSL", "NDEBUG", "DEBUG", "NO_CGI");
my $num_flags = @flags; my $num_flags = @flags;
sub fail { sub fail {
...@@ -8,21 +10,30 @@ sub fail { ...@@ -8,21 +10,30 @@ sub fail {
exit 1; exit 1;
} }
my $platform = $ARGV[0] || "linux"; my $extra = {
'USE_SSL' => '-lssl',
'USE_LUA' => 'lua_5.2.1.c',
};
#my $platform = $ARGV[0] || "linux";
for (my $i = 0; $i < 2 ** $num_flags; $i++) { for (my $i = 0; $i < 2 ** $num_flags; $i++) {
my $bitmask = sprintf("%*.*b", $num_flags, $num_flags, $i); my $bitmask = sprintf("%*.*b", $num_flags, $num_flags, $i);
my @combination = (); my @combination = ();
for (my $j = 0; $j < $num_flags; $j++) { for (my $j = 0; $j < $num_flags; $j++) {
push @combination, $flags[$j] if substr($bitmask, $j, 1); next unless substr($bitmask, $j, 1);
my $def = $flags[$j];
next if $def eq 'USE_LUA_SQLITE3';
push @combination, "-D$def";
push @combination, $extra->{$def} if $extra->{$def};
} }
my $defines = join(" ", map { "-D$_" } @combination); my $defines = join(" ", @combination);
my $cmd = "CFLAGS=\"$defines\" make clean $platform >/dev/null"; my $cmd = "make clean all CFLAGS_EXTRA=\"-O0 $defines\"";
#print "Testing [$defines]\n";
system($cmd) == 0 or fail "build failed: $_"; system($cmd) == 0 or fail "build failed: $_";
print "Build succeeded, flags: [$defines]\n"; #system("perl test/test.pl basic_tests >/dev/null") == 0
system("perl test/test.pl basic_tests >/dev/null") == 0 # or fail "basic tests";
or fail "basic tests"; #print "Basic tests: OK\n";
print "Basic tests: OK\n";
} }
print "PASS: All builds passed!\n"; print "PASS: All builds passed!\n";
...@@ -43,4 +43,4 @@ windows: ...@@ -43,4 +43,4 @@ windows:
#$(CL) lua_dll.c $(CLFLAGS) $(DLL_FLAGS) /DLL $(LFLAGS) /SUBSYSTEM:WINDOWS /ENTRY:luaopen_lua_dll /EXPORT:luaopen_lua_dll /out:lua_dll.dll #$(CL) lua_dll.c $(CLFLAGS) $(DLL_FLAGS) /DLL $(LFLAGS) /SUBSYSTEM:WINDOWS /ENTRY:luaopen_lua_dll /EXPORT:luaopen_lua_dll /out:lua_dll.dll
clean: clean:
rm -rf hello upload post websocket chat *.exe *.dSYM *.obj .*o @rm -rf hello upload post websocket chat *.exe *.dSYM *.obj .*o
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment