From 6e59ad8a0da8db917639805c2d1c6f465c6ee89c Mon Sep 17 00:00:00 2001
From: Sergey Lyubka <valenok@gmail.com>
Date: Sun, 19 May 2013 01:25:10 +0100
Subject: [PATCH] Fix for prepare_lua_environment
---
Makefile | 11 ++++++++---
test/test.pl | 2 +-
test/unit_test.c | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 46f5f3b96..f88f7bf76 100644
--- a/Makefile
+++ b/Makefile
@@ -107,6 +107,12 @@ bsd_lua: $(ALL_OBJECTS)
solaris:
$(CC) mongoose.c main.c -lnsl -lsocket -o $(PROG) $(CFLAGS)
+lib$(PROG).a: $(ALL_OBJECTS)
+ ar cr $@ $(ALL_OBJECTS)
+
+$(PROG).lib: $(ALL_WINOBJS)
+ $(MSVC)/bin/lib /out:$@ $(ALL_WINOBJS)
+
# For codesign to work in non-interactive mode, unlock login keychain:
# security unlock ~/Library/Keychains/login.keychain
# See e.g. http://lists.apple.com/archives/apple-cdsa/2008/Jan/msg00027.html
@@ -120,12 +126,12 @@ Mongoose: mongoose.c main.c
cocoa: Mongoose
V=`perl -lne '/define\s+MONGOOSE_VERSION\s+"(\S+)"/ and print $$1' mongoose.c`; DIR=dmg/Mongoose.app && rm -rf $$DIR && mkdir -p $$DIR/Contents/{MacOS,Resources} && install -m 644 build/mongoose_*.png $$DIR/Contents/Resources/ && install -m 644 build/Info.plist $$DIR/Contents/ && install -m 755 Mongoose $$DIR/Contents/MacOS/ && ln -fs /Applications dmg/ ; hdiutil create Mongoose_$$V.dmg -volname "Mongoose $$V" -srcfolder dmg -ov #; rm -rf dmg
-u:
+un:
$(CC) test/unit_test.c -o unit_test -I. -I$(LUA) $(LUA_SOURCES) \
$(CFLAGS) -g -O0
./unit_test
-w:
+wi:
$(CL) test/unit_test.c $(LUA_SOURCES) \
$(YASSL_SOURCES) $(YASSL_FLAGS) /DNO_SSL_DL \
$(MSLIB) /out:unit_test.exe
@@ -172,4 +178,3 @@ clean:
rm -rf *.o *.core $(PROG) *.obj *.so $(PROG).txt *.dSYM *.tgz \
$(PROG).exe *.dll *.lib build/res.o build/res.RES *.dSYM *.zip *.pdb \
*.exe *.dmg $(ALL_OBJECTS) $(ALL_WINOBJS)
-
diff --git a/test/test.pl b/test/test.pl
index 0a0628518..f6bda36cb 100644
--- a/test/test.pl
+++ b/test/test.pl
@@ -450,7 +450,7 @@ sub do_PUT_test {
}
sub do_unit_test {
- my $target = on_windows() ? 'w' : 'u';
+ my $target = on_windows() ? 'wi' : 'un';
system("make $target") == 0 or fail("Unit test failed!");
}
diff --git a/test/unit_test.c b/test/unit_test.c
index 40c907452..e6303d993 100644
--- a/test/unit_test.c
+++ b/test/unit_test.c
@@ -463,7 +463,7 @@ static void test_lua(void) {
&conn.request_info);
conn.content_len = conn.data_len - conn.request_len;
- prepare_lua_environment(&conn, L);
+ mg_prepare_lua_environment(&conn, L);
ASSERT(lua_gettop(L) == 0);
check_lua_expr(L, "'hi'", "hi");
--
GitLab