From: azv <azv@opencascade.com>
Date: Wed, 26 Feb 2020 13:22:38 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/occ/compounds_processing'
X-Git-Tag: V9_5_0a1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e89b22379f940eddb29d9412d93de8f4fc5d9d70;p=modules%2Fshaper.git

Merge remote-tracking branch 'remotes/origin/occ/compounds_processing'

# Conflicts:
#	src/FeaturesPlugin/CMakeLists.txt
---

6a23207a9154dac27c710190281aa5bfcf2bd498
diff --cc src/FeaturesPlugin/CMakeLists.txt
index 45dd74930,e472d6fc1..dea751490
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@@ -568,5 -570,89 +570,90 @@@ ADD_UNIT_TESTS(TestExtrusion.p
                 TestDefeaturing_OnCompound.py
                 Test3137_1.py
                 Test3137_2.py
 +               Test2918.py
+                Test3139.py
+                TestPlacement_MultiLevelCompound_v0_1.py
+                TestPlacement_MultiLevelCompound_v0_2.py
+                TestPlacement_MultiLevelCompound_v0_3.py
+                TestPlacement_MultiLevelCompound_v0_4.py
+                TestPlacement_MultiLevelCompound_v0_5.py
+                TestPlacement_MultiLevelCompound_v0_6.py
+                TestPlacement_MultiLevelCompound_v95_1.py
+                TestPlacement_MultiLevelCompound_v95_2.py
+                TestPlacement_MultiLevelCompound_v95_3.py
+                TestPlacement_MultiLevelCompound_v95_4.py
+                TestPlacement_MultiLevelCompound_v95_5.py
+                TestPlacement_MultiLevelCompound_v95_6.py
+                TestTranslation_MultiLevelCompound_v0_1.py
+                TestTranslation_MultiLevelCompound_v0_2.py
+                TestTranslation_MultiLevelCompound_v0_3.py
+                TestTranslation_MultiLevelCompound_v0_4.py
+                TestTranslation_MultiLevelCompound_v0_5.py
+                TestTranslation_MultiLevelCompound_v95_1.py
+                TestTranslation_MultiLevelCompound_v95_2.py
+                TestTranslation_MultiLevelCompound_v95_3.py
+                TestTranslation_MultiLevelCompound_v95_4.py
+                TestTranslation_MultiLevelCompound_v95_5.py
+                TestRotation_MultiLevelCompound_v0_1.py
+                TestRotation_MultiLevelCompound_v0_2.py
+                TestRotation_MultiLevelCompound_v0_3.py
+                TestRotation_MultiLevelCompound_v0_4.py
+                TestRotation_MultiLevelCompound_v95_1.py
+                TestRotation_MultiLevelCompound_v95_2.py
+                TestRotation_MultiLevelCompound_v95_3.py
+                TestRotation_MultiLevelCompound_v95_4.py
+                TestSymmetry_MultiLevelCompound_v0_1.py
+                TestSymmetry_MultiLevelCompound_v0_2.py
+                TestSymmetry_MultiLevelCompound_v0_3.py
+                TestSymmetry_MultiLevelCompound_v0_4.py
+                TestSymmetry_MultiLevelCompound_v0_5.py
+                TestSymmetry_MultiLevelCompound_v95_1.py
+                TestSymmetry_MultiLevelCompound_v95_2.py
+                TestSymmetry_MultiLevelCompound_v95_3.py
+                TestSymmetry_MultiLevelCompound_v95_4.py
+                TestSymmetry_MultiLevelCompound_v95_5.py
+                TestScale_MultiLevelCompound_v0_1.py
+                TestScale_MultiLevelCompound_v0_2.py
+                TestScale_MultiLevelCompound_v0_3.py
+                TestScale_MultiLevelCompound_v0_4.py
+                TestScale_MultiLevelCompound_v95_1.py
+                TestScale_MultiLevelCompound_v95_2.py
+                TestScale_MultiLevelCompound_v95_3.py
+                TestScale_MultiLevelCompound_v95_4.py
+                TestMultiTranslation_MultiLevelCompound_v0_1.py
+                TestMultiTranslation_MultiLevelCompound_v0_2.py
+                TestMultiTranslation_MultiLevelCompound_v0_3.py
+                TestMultiTranslation_MultiLevelCompound_v0_4.py
+                TestMultiTranslation_MultiLevelCompound_v95_1.py
+                TestMultiTranslation_MultiLevelCompound_v95_2.py
+                TestMultiTranslation_MultiLevelCompound_v95_3.py
+                TestMultiTranslation_MultiLevelCompound_v95_4.py
+                TestMultiRotation_MultiLevelCompound_v0_1.py
+                TestMultiRotation_MultiLevelCompound_v0_2.py
+                TestMultiRotation_MultiLevelCompound_v0_3.py
+                TestMultiRotation_MultiLevelCompound_v0_4.py
+                TestMultiRotation_MultiLevelCompound_v95_1.py
+                TestMultiRotation_MultiLevelCompound_v95_2.py
+                TestMultiRotation_MultiLevelCompound_v95_3.py
+                TestMultiRotation_MultiLevelCompound_v95_4.py
+                TestIntersection_MultiLevelCompound_v0_1.py
+                TestIntersection_MultiLevelCompound_v0_2.py
+                TestIntersection_MultiLevelCompound_v95_1.py
+                TestIntersection_MultiLevelCompound_v95_2.py
+                TestFillet_MultiLevelCompound_v0_1.py
+                TestFillet_MultiLevelCompound_v0_2.py
+                TestFillet_MultiLevelCompound_v0_3.py
+                TestFillet_MultiLevelCompound_v0_4.py
+                TestFillet_MultiLevelCompound_v95_1.py
+                TestFillet_MultiLevelCompound_v95_2.py
+                TestFillet_MultiLevelCompound_v95_3.py
+                TestFillet_MultiLevelCompound_v95_4.py
+                TestChamfer_MultiLevelCompound_v0_1.py
+                TestChamfer_MultiLevelCompound_v0_2.py
+                TestChamfer_MultiLevelCompound_v0_3.py
+                TestChamfer_MultiLevelCompound_v0_4.py
+                TestChamfer_MultiLevelCompound_v95_1.py
+                TestChamfer_MultiLevelCompound_v95_2.py
+                TestChamfer_MultiLevelCompound_v95_3.py
+                TestChamfer_MultiLevelCompound_v95_4.py
  )