Merge pull request #37 from rock-core/fix_roby_sql_path

fix: roby.sql is now in code/, update Dataset#roby_sql_index_path
rock-core · Sep 15, 2023 · f5f405a · f5f405a
2 parents 3d6f4b9 + 6b2d87d
commit f5f405a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/lib/syskit/log/datastore/dataset.rb b/lib/syskit/log/datastore/dataset.rb
@@ -700,6 +700,9 @@ def roby
             #
             # @return [Pathname]
             def roby_sql_index_path
+                p = dataset_path + "roby.sql"
+                return p if p.exist?
+
                 cache_path + "roby.sql"
             end
 

diff --git a/test/datastore/import_test.rb b/test/datastore/import_test.rb
@@ -212,6 +212,7 @@ def tty_reporter
 
                     assert (imported.dataset_path + "roby.sql").exist?
                     assert index_path.exist?
+                    assert imported.roby_sql_index_path.exist?
 
                     index = Roby::DRoby::Logfile::Index.read(index_path)
                     assert index.valid_for?(log_path)