瀏覽代碼

Travis/Linux fix

Thomas Buck 10 年之前
父節點
當前提交
c69125ae26
共有 2 個文件被更改,包括 8 次插入5 次删除
  1. 1
    0
      src/utils/Folder.cpp
  2. 7
    5
      test/CMakeLists.txt

+ 1
- 0
src/utils/Folder.cpp 查看文件

8
 #include <algorithm>
8
 #include <algorithm>
9
 #include <iostream>
9
 #include <iostream>
10
 #include <sstream>
10
 #include <sstream>
11
+#include <cstring>
11
 
12
 
12
 #include "global.h"
13
 #include "global.h"
13
 #include "utils/filesystem.h"
14
 #include "utils/filesystem.h"

+ 7
- 5
test/CMakeLists.txt 查看文件

7
 #################################################################
7
 #################################################################
8
 
8
 
9
 add_executable (tester_binary EXCLUDE_FROM_ALL
9
 add_executable (tester_binary EXCLUDE_FROM_ALL
10
-    "binary.cpp" "../src/utils/binary.cpp" "../src/main.cpp"
10
+    "binary.cpp" "../src/utils/binary.cpp"
11
+    "../src/Exception.cpp" "../src/main.cpp"
11
 )
12
 )
12
 add_dependencies (check tester_binary)
13
 add_dependencies (check tester_binary)
13
 add_test (NAME test_binary COMMAND tester_binary)
14
 add_test (NAME test_binary COMMAND tester_binary)
20
     "../src/Exception.cpp" "../src/main.cpp"
21
     "../src/Exception.cpp" "../src/main.cpp"
21
 )
22
 )
22
 
23
 
23
-#add_dependencies (check tester_folder)
24
+add_dependencies (check tester_folder)
24
 #add_test (NAME test_folder COMMAND tester_folder)
25
 #add_test (NAME test_folder COMMAND tester_folder)
25
 
26
 
26
 #################################################################
27
 #################################################################
27
 
28
 
28
 add_executable (tester_script EXCLUDE_FROM_ALL
29
 add_executable (tester_script EXCLUDE_FROM_ALL
29
-    "Script.cpp" "../src/Script.cpp" "../src/main.cpp"
30
-    "../src/utils/binary.cpp" "../src/utils/strings.cpp"
30
+    "Script.cpp" "../src/Script.cpp" "../src/utils/strings.cpp"
31
+    "../src/utils/binary.cpp" "../src/utils/filesystem.cpp"
32
+    "../src/Exception.cpp" "../src/main.cpp"
31
 )
33
 )
32
 
34
 
33
-#add_dependencies (check tester_script)
35
+add_dependencies (check tester_script)
34
 #add_test (NAME test_script COMMAND tester_script)
36
 #add_test (NAME test_script COMMAND tester_script)
35
 
37
 
36
 #################################################################
38
 #################################################################

Loading…
取消
儲存