OLD | NEW |
1 diff -Naur gtest-1.5.0/Makefile gtest-1.5.0.nacl/Makefile | 1 diff -Naur gtest-1.5.0/Makefile gtest-1.5.0.nacl/Makefile |
2 --- gtest-1.5.0/Makefile 1969-12-31 17:00:00.000000000 -0700 | 2 --- gtest-1.5.0/Makefile 1969-12-31 17:00:00.000000000 -0700 |
3 +++ gtest-1.5.0.nacl/Makefile 2010-07-08 09:49:37.000000000 -0600 | 3 +++ gtest-1.5.0.nacl/Makefile 2010-07-08 09:49:37.000000000 -0600 |
4 @@ -0,0 +1,25 @@ | 4 @@ -0,0 +1,32 @@ |
5 +CXXFLAGS = -O0 -g | 5 +CXXFLAGS = -O0 -g |
6 +INCLUDE = -Iinclude -I. | 6 +INCLUDE = -Iinclude -I. |
7 +LIB_GTEST = libgtest.a | 7 +LIB_GTEST = libgtest.a |
8 +OBJ_DIR = obj | 8 +OBJ_DIR = obj |
9 + | 9 + |
10 +OBJ_FILES = gtest.o \ | 10 +OBJ_FILES = gtest.o \ |
11 + gtest-filepath.o \ | 11 + gtest-filepath.o \ |
12 + gtest-port.o \ | 12 + gtest-port.o \ |
13 + gtest-test-part.o \ | 13 + gtest-test-part.o \ |
14 + gtest-typed-test.o | 14 + gtest-typed-test.o |
15 + | 15 + |
| 16 +# Necessary because we can't CD to the obj directory on windows. |
| 17 +OBJ_LIST = $(OBJ_DIR)/gtest.o \ |
| 18 + $(OBJ_DIR)/gtest-filepath.o \ |
| 19 + $(OBJ_DIR)/gtest-port.o \ |
| 20 + $(OBJ_DIR)/gtest-test-part.o \ |
| 21 + $(OBJ_DIR)/gtest-typed-test.o |
| 22 + |
16 +all: $(LIB_GTEST) | 23 +all: $(LIB_GTEST) |
17 + @echo "Making libgtest" | 24 + @echo "Making libgtest" |
18 + | 25 + |
19 +clean: | 26 +clean: |
20 + rm -rf $(OBJ_DIR) $(LIB_GTEST) | 27 + rm -rf $(OBJ_DIR) $(LIB_GTEST) |
21 + | 28 + |
22 +$(OBJ_DIR): | 29 +$(OBJ_DIR): |
23 + mkdir $(OBJ_DIR) | 30 + mkdir $(OBJ_DIR) |
24 + | 31 + |
25 +$(OBJ_FILES): %.o: src/%.cc $(OBJ_DIR) | 32 +$(OBJ_FILES): %.o: src/%.cc $(OBJ_DIR) |
26 + $(CXX) -c $(INCLUDE) $(CXXFLAGS) $< -o $(OBJ_DIR)/$@ | 33 + $(CXX) -c $(INCLUDE) $(CXXFLAGS) $< -o $(OBJ_DIR)/$@ |
27 + | 34 + |
28 +$(LIB_GTEST): $(OBJ_DIR) $(OBJ_FILES) | 35 +$(LIB_GTEST): $(OBJ_DIR) $(OBJ_FILES) |
29 +» cd $(OBJ_DIR) && $(AR) rcs ../$(LIB_GTEST) $(OBJ_FILES) | 36 +» $(AR) rcs $(LIB_GTEST) $(OBJ_LIST) |
30 diff -Naur gtest-1.5.0/include/gtest/gtest.h gtest-1.5.0.nacl/include/gtest/gtes
t.h | 37 diff -Naur gtest-1.5.0/include/gtest/gtest.h gtest-1.5.0.nacl/include/gtest/gtes
t.h |
31 --- gtest-1.5.0/include/gtest/gtest.h 2010-04-15 16:02:03.000000000 -0600 | 38 --- gtest-1.5.0/include/gtest/gtest.h 2010-04-15 16:02:03.000000000 -0600 |
32 +++ gtest-1.5.0.nacl/include/gtest/gtest.h 2010-07-08 09:49:37.000000000 -0
600 | 39 +++ gtest-1.5.0.nacl/include/gtest/gtest.h 2010-07-08 09:49:37.000000000 -0
600 |
33 @@ -56,7 +56,6 @@ | 40 @@ -56,7 +56,6 @@ |
34 | 41 #include <gtest/internal/gtest-internal.h>ls |
35 #include <gtest/internal/gtest-internal.h> | 42 |
36 #include <gtest/internal/gtest-string.h> | 43 #include <gtest/internal/gtest-string.h> |
37 -#include <gtest/gtest-death-test.h> | 44 -#include <gtest/gtest-death-test.h> |
38 #include <gtest/gtest-message.h> | 45 #include <gtest/gtest-message.h> |
39 #include <gtest/gtest-param-test.h> | 46 #include <gtest/gtest-param-test.h> |
40 #include <gtest/gtest_prod.h> | 47 #include <gtest/gtest_prod.h> |
41 diff -Naur gtest-1.5.0/include/gtest/internal/gtest-port.h gtest-1.5.0.nacl/incl
ude/gtest/internal/gtest-port.h | 48 diff -Naur gtest-1.5.0/include/gtest/internal/gtest-port.h gtest-1.5.0.nacl/incl
ude/gtest/internal/gtest-port.h |
42 --- gtest-1.5.0/include/gtest/internal/gtest-port.h 2010-04-15 16:02:02.0000
00000 -0600 | 49 --- gtest-1.5.0/include/gtest/internal/gtest-port.h 2010-04-15 16:02:02.0000
00000 -0600 |
43 +++ gtest-1.5.0.nacl/include/gtest/internal/gtest-port.h 2010-07-08 09:49
:37.000000000 -0600 | 50 +++ gtest-1.5.0.nacl/include/gtest/internal/gtest-port.h 2010-07-08 09:49
:37.000000000 -0600 |
44 @@ -222,14 +222,13 @@ | 51 @@ -222,14 +222,13 @@ |
45 #endif // __CYGWIN__ | 52 #endif // __CYGWIN__ |
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 --- gtest-1.5.0/src/gtest_main.cc 2010-04-15 16:02:04.000000000 -0600 | 224 --- gtest-1.5.0/src/gtest_main.cc 2010-04-15 16:02:04.000000000 -0600 |
218 +++ gtest-1.5.0.nacl/src/gtest_main.cc 2010-07-08 10:14:13.000000000 -0600 | 225 +++ gtest-1.5.0.nacl/src/gtest_main.cc 2010-07-08 10:14:13.000000000 -0600 |
219 @@ -33,7 +33,6 @@ | 226 @@ -33,7 +33,6 @@ |
220 | 227 |
221 int main(int argc, char **argv) { | 228 int main(int argc, char **argv) { |
222 std::cout << "Running main() from gtest_main.cc\n"; | 229 std::cout << "Running main() from gtest_main.cc\n"; |
223 - | 230 - |
224 testing::InitGoogleTest(&argc, argv); | 231 testing::InitGoogleTest(&argc, argv); |
225 return RUN_ALL_TESTS(); | 232 return RUN_ALL_TESTS(); |
226 } | 233 } |
OLD | NEW |