diff options
| author | Veerapuram Varadhan <v.varadhan@gmail.com> | 2009-09-27 01:01:35 +0400 |
|---|---|---|
| committer | Veerapuram Varadhan <v.varadhan@gmail.com> | 2009-09-27 01:01:35 +0400 |
| commit | 774fd03e786d9b8380d93dd1ba5af7f9795cf34a (patch) | |
| tree | 830fea9103cb302c77f1ff7a0298882a0dc7d7b4 /mcs/class/System.Data/Test | |
| parent | 8b8d58705b4db1e1365ce4927148db2cccb7c211 (diff) | |
Test fix.
svn path=/branches/mono-2-6/mcs/; revision=142689
Diffstat (limited to 'mcs/class/System.Data/Test')
| -rw-r--r-- | mcs/class/System.Data/Test/System.Data/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.Data/Test/System.Data/DataSetTest2.cs | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mcs/class/System.Data/Test/System.Data/ChangeLog b/mcs/class/System.Data/Test/System.Data/ChangeLog index d96346d1d9b..93921c52b46 100644 --- a/mcs/class/System.Data/Test/System.Data/ChangeLog +++ b/mcs/class/System.Data/Test/System.Data/ChangeLog @@ -1,5 +1,10 @@ 2009-09-26 Veerapuram Varadhan <vvaradhan@novell.com> + * DataSetTest2.cs: Don't run the test for Bug#536194 in 1.x + profile. Makes build bot go all green on Sys.Data. + +2009-09-26 Veerapuram Varadhan <vvaradhan@novell.com> + * DataSetTypedDataSet.cs: Test for #427769. Patch by John Lenz <jlenz2@math.uiuc.edu>. diff --git a/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs b/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs index 664e2d44f41..8a3b58981ba 100644 --- a/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs +++ b/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs @@ -3467,6 +3467,7 @@ namespace MonoTests_System.Data Assert.AreEqual (typeof (string), ds.Tables [0].Columns [0].DataType, "#5"); } +#if NET_2_0 [Test] public void MergeTest_SameDataSet_536194 () { @@ -3479,6 +3480,7 @@ namespace MonoTests_System.Data dataSet.Merge(dataTable); Assert.AreEqual (1, dataSet.Tables.Count, "1"); } +#endif #if NET_2_0 [Test] |