Applied new folders structure to the Chapter11

apolukhin · Jun 7, 2017 · b82a9e9 · b82a9e9
1 parent 4969456
commit b82a9e9
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 18 deletions.
diff --git a/Chapter11/erasing_files/erasing_files.pro → ...r11/01_listing_files/01_listing_files.pro b/Chapter11/erasing_files/erasing_files.pro → ...r11/01_listing_files/01_listing_files.pro
diff --git a/Chapter11/listing_files/main.cpp → Chapter11/01_listing_files/main.cpp b/Chapter11/listing_files/main.cpp → Chapter11/01_listing_files/main.cpp
diff --git a/Chapter11/listing_files/listing_files.pro → ...r11/02_erasing_files/02_erasing_files.pro b/Chapter11/listing_files/listing_files.pro → ...r11/02_erasing_files/02_erasing_files.pro
diff --git a/Chapter11/erasing_files/main.cpp → Chapter11/02_erasing_files/main.cpp b/Chapter11/erasing_files/main.cpp → Chapter11/02_erasing_files/main.cpp
diff --git a/...terprocess_basics/interprocess_basics.pro → ...process_basics/05_interprocess_basics.pro b/...terprocess_basics/interprocess_basics.pro → ...process_basics/05_interprocess_basics.pro
diff --git a/Chapter11/interprocess_basics/main.cpp → Chapter11/05_interprocess_basics/main.cpp b/Chapter11/interprocess_basics/main.cpp → Chapter11/05_interprocess_basics/main.cpp
diff --git a/...rocess_pointers/interprocess_pointers.pro → ...erprocess_queue/06_interprocess_queue.pro b/...rocess_pointers/interprocess_pointers.pro → ...erprocess_queue/06_interprocess_queue.pro
diff --git a/Chapter11/interprocess_queue/main.cpp → Chapter11/06_interprocess_queue/main.cpp b/Chapter11/interprocess_queue/main.cpp → Chapter11/06_interprocess_queue/main.cpp
diff --git a/...interprocess_queue/interprocess_queue.pro → ...ess_pointers/07_interprocess_pointers.pro b/...interprocess_queue/interprocess_queue.pro → ...ess_pointers/07_interprocess_pointers.pro
diff --git a/Chapter11/interprocess_pointers/main.cpp → Chapter11/07_interprocess_pointers/main.cpp b/Chapter11/interprocess_pointers/main.cpp → Chapter11/07_interprocess_pointers/main.cpp
diff --git a/Chapter11/reading_files/reading_files.pro → ...r11/08_reading_files/08_reading_files.pro b/Chapter11/reading_files/reading_files.pro → ...r11/08_reading_files/08_reading_files.pro
diff --git a/Chapter11/reading_files/main.cpp → Chapter11/08_reading_files/main.cpp b/Chapter11/reading_files/main.cpp → Chapter11/08_reading_files/main.cpp
diff --git a/Chapter11/coroutines/coroutines.pro → Chapter11/09_coroutines/09_coroutines.pro b/Chapter11/coroutines/coroutines.pro → Chapter11/09_coroutines/09_coroutines.pro
diff --git a/Chapter11/coroutines/main.cpp → Chapter11/09_coroutines/main.cpp b/Chapter11/coroutines/main.cpp → Chapter11/09_coroutines/main.cpp
diff --git a/Chapter11/Chapter11.pro b/Chapter11/Chapter11.pro
@@ -1,13 +1,13 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    listing_files \
-    erasing_files \
-    interprocess_basics \
-    interprocess_queue \
-    interprocess_pointers \
-    reading_files \
-    coroutines
+    01_listing_files \
+    02_erasing_files \
+    05_interprocess_basics \
+    06_interprocess_queue \
+    07_interprocess_pointers \
+    08_reading_files \
+    09_coroutines
 
 
 

diff --git a/test.py b/test.py
@@ -64,7 +64,6 @@ class tester:
         'Chapter09/05_bimap': ('Left:\nAnton Polukhin <=> 3\nAntony Polukhin <=> 3\nJohn Snow <=> 1\nVasya Pupkin <=> 2\n\nRight:\n1 <=> John Snow\n2 <=> Vasya Pupkin\n3 <=> Antony Polukhin\n3 <=> Anton Polukhin\n', '', 0),
         'Chapter09/06_multiindex': ('0:\nAnton Polukhin, 3, 182, 70\nAntony Polukhin, 3, 183, 70\nJohn Snow, 1, 185, 80\nVasya Pupkin, 2, 165, 60\n\n1:\nJohn Snow, 1, 185, 80\nVasya Pupkin, 2, 165, 60\nAnton Polukhin, 3, 182, 70\nAntony Polukhin, 3, 183, 70\n\n2:\nVasya Pupkin, 2, 165, 60\nAnton Polukhin, 3, 182, 70\nAntony Polukhin, 3, 183, 70\nJohn Snow, 1, 185, 80\n\n3:\nVasya Pupkin, 2, 165, 60\nAntony Polukhin, 3, 183, 70\nAnton Polukhin, 3, 182, 70\nJohn Snow, 1, 185, 80\n\n', '', 0),
         'Chapter10/03_no_rtti': ('type_index type_id() [with T = double]', '', 0),
-        'Chapter11/erasing_files': ('', 'Failed to create a symlink\n', 0),
         'Chapter12/gil': ('', "terminate called after throwing an instance of 'std::ios_base::failure'\n  what():  file_mgr: failed to open file\n", -6),
         'Chapter12/graph': ('Boost\nC++ guru\n', '', 0),
         'Chapter12/graph_vis': ('digraph G {\n0 [label="C++"];\n1 [label="STL"];\n2 [label="Boost"];\n3 [label="C++ guru"];\n4 [label="C"];\n0->1 ;\n1->2 ;\n2->3 ;\n4->3 ;\n}\n', '', 0),
@@ -250,16 +249,16 @@ def _test_regex_replace(test_name, path):
     def _test_export_import(test_name, path):
         try:
             copyfile(
-                "Chapter10/my_library/debug/my_library.dll",
-                "./my_library.dll"
+                "Chapter10/06_A_my_library/debug/06_A_my_library.dll",
+                "./06_A_my_library.dll"
             )
         except:
             pass
 
         try:
             copyfile(
-                "Chapter10/my_library/release/my_library.dll",
-                "./my_library.dll"
+                "Chapter10/06_A_my_library/release/06_A_my_library.dll",
+                "./06_A_my_library.dll"
             )
         except:
             pass
@@ -305,15 +304,16 @@ def _test_recipe(path):
             'Chapter08/02_manipulating_vector_of_types': tester._test_but_ignore_output_diff,   # Different manglings
             "Chapter10/03_no_rtti": tester._test_but_ignore_output_diff,                # Different demangled representation of a type
             "Chapter10/06_B_export_import": tester._test_export_import,
-            "Chapter11/listing_files": tester._test_but_ignore_output_diff,
-            "Chapter11/coroutines": tester._test_but_ignore_output_diff, # Sanitizers do not like coroutines and add some warnings
+            "Chapter11/01_listing_files": tester._test_but_ignore_output_diff,
+            "Chapter11/09_coroutines": tester._test_but_ignore_output_diff, # Sanitizers do not like coroutines and add some warnings
             "Chapter12/random": tester._test_but_ignore_output_diff,
 
             # TODO:
-            "Chapter11/reading_files": tester._ignore,
-            "Chapter11/interprocess_basics": tester._ignore,
-            "Chapter11/interprocess_pointers": tester._ignore,
-            "Chapter11/interprocess_queue": tester._ignore,
+            "Chapter11/02_erasing_files": tester._ignore,
+            "Chapter11/05_interprocess_basics": tester._ignore,
+            "Chapter11/06_interprocess_queue": tester._ignore,
+            "Chapter11/07_interprocess_pointers": tester._ignore,
+            "Chapter11/08_reading_files": tester._ignore,
             "Chapter12/gil": tester._ignore, #tester._test_gil,
         }